frap 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c9b0b37bc3db97c0fa4da096081a9172a2a4579eb185ea1b3a3613e2eec9e53
-  data.tar.gz: 5c701bc7b28b449fa300f4c3449d07bda9b530983ae2d67637cb3b1891feb8d9
+  metadata.gz: 0a94c44eaae2cb515d4ae619672a6e2eed5d3e352c9ccceb60e49bc6123f2d2b
+  data.tar.gz: 8e3f7a0d93b24ac0bb3ffdb5b2963cbb09e2c83c26e33d16970b88f194cc382b
 SHA512:
-  metadata.gz: 99fcc47f280d953775d23f796ebc76c19196b2c21bdf183860854310f5ff188056e53599bdd4f6c4c239592ebcb5db9a24227c3d7c5500f79adc7b19205beb02
-  data.tar.gz: 1407e786731d16af8f5b8d9b2ebb3f9dfcbd182e1b29cfacc4e0d856b2189f766c9433e51b52dac2786dfd9ab067f7aaa02225ad3636f9c5dfdc34023e86321e
+  metadata.gz: e955d2a12647e5ba589f6d88baa5aa68c1105d4cb3618836ec9e60299286fede785f4d0fb190c47d516f4295a36409c6937e70e606ebebdb6593ce0ef706f96a
+  data.tar.gz: ad972c11753fa6ecbaa24cb81c147d657650356a615909b6dd254678108daec5182643aafb23c596a50f9964f2738fd745f7afcd263eaf9428d9360b31b1d8c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frap (0.1.1)
+    frap (0.2.0)
       thor (~> 0.20.3)
 
 GEM

data/lib/frap.rb

@@ -1,6 +1,7 @@
 require 'frap/version'
 require 'frap/create_app'
-require 'frap/generators/generate'
+require 'frap/create_resource'
+require 'frap/commands/generate'
 require 'frap/generators/config'
 require 'frap/generators/flutter_config'
 require 'thor'
@@ -30,6 +31,6 @@ module Frap
       Generate all the boiler plate code such as controllers, pages and blocks for Rails and Flutter.
       run `frap g help` to see a list of existing generators
     LONGDESC
-    subcommand 'generate', Frap::Generators::Generate
+    subcommand 'generate', Frap::Commands::Generate
   end
 end

data/lib/frap/{generators → commands}/generate.rb

@@ -1,8 +1,7 @@
 require 'thor'
-require 'frap/generators/resource'
 
 module Frap
-  module Generators
+  module Commands
     class Generate < Thor
       desc 'resource NAME', 'generate a resource'
       method_option :rails, type: :boolean, aliases: :r, default: true
@@ -10,7 +9,7 @@ module Frap
       method_option :attributes, type: :hash, aliases: :a
 
       def resource(name)
-        Frap::Generators::Resource.new(name, options).create_resource
+        Frap::CreateResource.new(name, options).create_resource
       end
     end
   end

data/lib/frap/create_app.rb

@@ -1,6 +1,3 @@
-require 'thor'
-require 'frap/generators/config'
-
 module Frap
   class CreateApp
     attr_accessor :name
@@ -60,8 +57,23 @@ module Frap
     end
 
     def show_completed_notes
-      shell.say(shell_text('DONE'), :green)
+      shell.say(shell_text('YAY! App setup complete!'), :green)
       shell.say('TODO: Install your favourite Rails Testing library', :yellow)
+      shell.say(shell_text(''), :green)
+
+      shell.say('Generate Some resources:', :yellow)
+      shell.say("cd #{working_dir}", :green)
+      shell.say('frap generate resource user --attributes name:string age:integer', :green)
+
+      shell.say('Start the rails serve:', :yellow)
+      shell.say("cd #{working_dir}/#{server_name}", :green)
+      shell.say("rails s", :green)
+
+      shell.say('Start the Flutter App:', :yellow)
+      shell.say("cd #{working_dir}/#{ui_name}", :green)
+      shell.say("flutter run", :green)
+
+      shell.say(shell_text('========================'), :green)
     end
 
     def server_name

data/lib/frap/create_base.rb

@@ -0,0 +1,2 @@
+class CreateBase
+end

data/lib/frap/create_resource.rb

@@ -0,0 +1,62 @@
+require 'yaml'
+
+module Frap
+  class CreateResource
+    attr_accessor :name, :attributes, :options
+
+    def initialize(name, options)
+      @name = name
+      @options = options
+    end
+
+    def create_resource
+      generate_rails_resource if options['rails']
+      generate_flutter_resource if options['flutter']
+    end
+
+    private
+
+    def generate_rails_resource
+      Dir.chdir("#{working_dir}/#{rails_app}")
+
+      system("rails generate resource #{name} #{fields}")
+    end
+
+    def generate_flutter_resource
+      Dir.chdir("#{working_dir}/#{flutter_app}")
+
+      puts "TODO: frap g flutter resource #{name} #{fields}"
+    end
+
+    def fields
+      @fields ||= build_fields
+    end
+
+    def build_fields
+      return unless options[:attributes]
+
+      fields_string = ''
+      options[:attributes].each { |k, v| fields_string << "#{k}:#{v} " }
+
+      return fields_string
+    end
+
+    private
+
+    def working_dir
+      @working_dir ||= Dir.pwd
+    end
+
+    def config
+      @config ||= YAML.load(File.read('config.yml'))
+    end
+
+    def flutter_app
+      config['flutter_app']
+    end
+
+    def rails_app
+      config['rails_app']
+    end
+  end
+end

data/lib/frap/generators/config.rb

@@ -1,6 +1,3 @@
-require 'thor'
-require 'thor/group'
-
 module Frap
   module Generators
     class Config < Thor::Group

data/lib/frap/generators/flutter_config.rb

@@ -1,7 +1,3 @@
-
-require 'thor'
-require 'thor/group'
-
 module Frap
   module Generators
     class FlutterConfig < Thor::Group
@@ -22,18 +18,33 @@ module Frap
       end
 
       def create_directories
-        empty_directory("#{lib_directory}/src/home")
+        empty_directory("#{lib_directory}/src/animations")
+        empty_directory("#{lib_directory}/src/config")
+        empty_directory("#{lib_directory}/src/constants")
+        empty_directory("#{lib_directory}/src/screens")
+        empty_directory("#{lib_directory}/src/widgets")
         invoke :create_files
       end
 
       def create_files
         template('main.dart.erb', "#{lib_directory}/main.dart")
-        template('src/app_bloc.dart.erb', "#{src_directory}/app_bloc.dart")
-        template('src/app_module.dart.erb', "#{src_directory}/app_module.dart")
-        template('src/app_widget.dart.erb', "#{src_directory}/app_widget.dart")
-        template('src/home/home_bloc.dart.erb', "#{src_directory}/home/home_bloc.dart")
-        template('src/home/home_module.dart.erb', "#{src_directory}/home/home_module.dart")
-        template('src/home/home_page.dart.erb', "#{src_directory}/home/home_page.dart")
+        template('src/app.dart.erb', "#{src_directory}/app.dart")
+        template('src/animations/slide_right_route.dart.erb', "#{src_directory}/animations/slide_right_route.dart")
+        template('src/config/router.dart.erb', "#{src_directory}/config/router.dart")
+        template('src/constants/pages_list.dart.erb', "#{src_directory}/constants/pages_list.dart")
+        template('src/constants/routing.dart.erb', "#{src_directory}/constants/routing.dart")
+        template('src/screens/base.dart.erb', "#{src_directory}/screens/home_screen.dart")
+        template('src/screens/undefined_route_screen.dart.erb', "#{src_directory}/screens/undefined_route_screen.dart")
+        template('src/widgets/base_app_bar.dart.erb', "#{src_directory}/widgets/base_app_bar.dart")
+        template('src/widgets/popup_menu_widget.dart.erb', "#{src_directory}/widgets/popup_menu_widget.dart")
+
+        invoke :setup_pages
+      end
+
+      def setup_pages
+        inject_into_file("#{src_directory}/config/router.dart", home_router, after: /^.*switch \(settings.name\) \{$/)
+        inject_into_file("#{src_directory}/constants/pages_list.dart", home_route, after: /const List<Page> pages = const <Page>\[.*$/)
+        append_to_file("#{src_directory}/constants/routing.dart", "const String HomeScreenRoute = '/';")
       end
 
       private
@@ -56,6 +67,17 @@ module Frap
   rxdart: ^0.22.0
   bloc_pattern: ^2.2.3)
       end
+
+      def home_router
+        %Q(
+     case HomeScreenRoute:
+      return SlideRightRoute(widget:HomeScreen());)
+      end
+
+      def home_route
+        %Q(
+     const Page(title: 'Home', icon: Icons.home, route: HomeScreenRoute),)
+      end
     end
   end
 end

data/lib/frap/generators/flutter_resource.rb

@@ -0,0 +1,57 @@
+module Frap
+  module Generators
+    class FlutterResource < Thor::Group
+      include Thor::Actions
+
+      desc 'Generate Flutter Config files'
+      argument :name
+      argument :folder_name
+
+      def self.source_root
+        File.dirname(__FILE__) + '/templates/dart'
+      end
+
+      def configure_directories
+        inject_into_file("#{working_directory}/pubspec.yaml", pub_files, after: /^dependencies:.*$/)
+        remove_file("#{lib_directory}/main.dart")
+        invoke :create_directories
+      end
+
+      def create_directories
+        empty_directory("#{lib_directory}/src/home")
+        invoke :create_files
+      end
+
+      def create_files
+        template('main.dart.erb', "#{lib_directory}/main.dart")
+        template('src/app_bloc.dart.erb', "#{src_directory}/app_bloc.dart")
+        template('src/app_module.dart.erb', "#{src_directory}/app_module.dart")
+        template('src/app_widget.dart.erb', "#{src_directory}/app_widget.dart")
+        template('src/home/home_bloc.dart.erb', "#{src_directory}/home/home_bloc.dart")
+        template('src/home/home_module.dart.erb', "#{src_directory}/home/home_module.dart")
+        template('src/home/home_page.dart.erb', "#{src_directory}/home/home_page.dart")
+      end
+
+      private
+
+      def working_directory
+        "#{destination_root}/#{folder_name}"
+      end
+
+      def lib_directory
+        "#{working_directory}/lib"
+      end
+
+      def src_directory
+        "#{lib_directory}/src"
+      end
+
+      def pub_files
+        %Q(
+  dio: ^2.1.13
+  rxdart: ^0.22.0
+  bloc_pattern: ^2.2.3)
+      end
+    end
+  end
+end

data/lib/frap/generators/templates/dart/main.dart.erb

@@ -1,4 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:<%= folder_name %>/src/app_module.dart';
+import 'package:<%= folder_name %>/src/app.dart';
 
-void main() => runApp(AppModule());
+void main() => runApp(App());

data/lib/frap/generators/templates/dart/src/animations/slide_right_route.dart.erb

@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+
+class SlideRightRoute extends PageRouteBuilder {
+  final Widget widget;
+  SlideRightRoute({this.widget}) : super(
+    pageBuilder: (BuildContext context, Animation<double> animation,
+        Animation<double> secondaryAnimation) {
+      return widget;
+    },
+    transitionsBuilder: (BuildContext context,
+        Animation<double> animation,
+        Animation<double> secondaryAnimation,
+        Widget child) {
+      return new SlideTransition(
+        position: new Tween<Offset>(
+          begin: const Offset(1.0, 0.0),
+          end: Offset.zero,
+        ).animate(animation),
+        child: child,
+      );
+    },
+  );
+}

data/lib/frap/generators/templates/dart/src/app.dart.erb

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:<%= folder_name %>/src/screens/undefined_route_screen.dart';
+import 'package:<%= folder_name %>/src/screens/home_screen.dart';
+import 'package:<%= folder_name %>/src/config/router.dart' as router;
+import 'package:<%= folder_name %>/src/constants/routing.dart';
+
+class App extends StatelessWidget {
+  @override
+
+  static const String _title = '<%= folder_name %>';
+
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      title: _title,
+      theme: ThemeData.light(),
+      home: HomeScreen(),
+      initialRoute: HomeScreenRoute,
+      onGenerateRoute: router.generateRoute,
+      onUnknownRoute: (settings) => MaterialPageRoute(
+          builder: (context) => UndefinedRouteScreen(
+            name: settings.name,
+          )
+      ),
+    );
+  }
+}

data/lib/frap/generators/templates/dart/src/config/router.dart.erb

@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+
+import 'package:<%= folder_name %>/src/animations/slide_right_route.dart';
+import 'package:<%= folder_name %>/src/constants/routing.dart';
+import 'package:<%= folder_name %>/src/screens/home_screen.dart';
+import 'package:<%= folder_name %>/src/screens/undefined_route_screen.dart';
+
+
+Route<dynamic> generateRoute(RouteSettings settings) {
+  switch (settings.name) {
+    default:
+      return SlideRightRoute(widget:UndefinedRouteScreen());
+  }
+}

data/lib/frap/generators/templates/dart/src/constants/pages_list.dart.erb

@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+import 'package:<%= folder_name %>/src/constants/routing.dart';
+
+class Page {
+const Page({this.title, this.icon, this.route});
+
+final String title;
+final IconData icon;
+final String route;
+}
+
+const List<Page> pages = const <Page>[
+];

data/lib/frap/generators/templates/dart/src/constants/routing.dart.erb

@@ -0,0 +1 @@
+

data/lib/frap/generators/templates/dart/src/screens/base.dart.erb

@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+import 'package:<%= folder_name %>/src/constants/routing.dart';
+import 'package:<%= folder_name %>/src/widgets/base_app_bar.dart';
+import 'package:<%= folder_name %>/src/widgets/popup_menu_widget.dart';
+
+class HomeScreen extends StatelessWidget {
+  @override
+
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: BaseAppBar(
+        title: Text('<%= name %>'),
+        appBar: AppBar(),
+        widgets: <Widget>[
+          PopupMenuWidget(),
+        ],
+      ),
+      body: Center(
+        child: Text('<%= name %>'),
+      ),
+    );
+  }
+}

data/lib/frap/generators/templates/dart/src/screens/undefined_route_screen.dart.erb

@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+
+class UndefinedRouteScreen extends StatelessWidget {
+  final String name;
+  const UndefinedRouteScreen({Key key, this.name}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Text('Route for $name is not defined'),
+      ),
+    );
+  }
+}

data/lib/frap/generators/templates/dart/src/widgets/base_app_bar.dart.erb

@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+
+class BaseAppBar extends StatelessWidget implements PreferredSizeWidget {
+  final Color backgroundColor = Colors.blue;
+  final Text title;
+  final AppBar appBar;
+  final List<Widget> widgets;
+
+  const BaseAppBar({Key key, this.title, this.appBar, this.widgets})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return AppBar(
+      title: title,
+      backgroundColor: backgroundColor,
+      actions: widgets,
+    );
+  }
+
+  @override
+  Size get preferredSize => new Size.fromHeight(appBar.preferredSize.height);
+}

data/lib/frap/generators/templates/dart/src/widgets/popup_menu_widget.dart.erb

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+import 'package:<%= folder_name %>/src/constants/pages_list.dart';
+import 'package:<%= folder_name %>/src/constants/routing.dart';
+
+class PopupMenuWidget extends StatefulWidget {
+  @override
+  _PopupMenuWidgetState createState() => _PopupMenuWidgetState();
+}
+
+class _PopupMenuWidgetState extends State<PopupMenuWidget> {
+  @override
+
+  _onSelect(Page page) {
+    Navigator.pushNamed(context, page.route);
+  }
+
+  Widget build(BuildContext context) {
+    return PopupMenuButton<Page>(
+      onSelected: _onSelect,
+      itemBuilder: (BuildContext context) {
+        return pages.map((Page page) {
+          return PopupMenuItem<Page>(
+            value: page,
+            child: Text(page.title),
+          );
+        }).toList();
+      },
+    );
+  }
+}

data/lib/frap/version.rb

@@ -1,3 +1,3 @@
 module Frap
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Gascoigne - Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -104,19 +104,24 @@ files:
 - bin/setup
 - frap.gemspec
 - lib/frap.rb
+- lib/frap/commands/generate.rb
 - lib/frap/create_app.rb
+- lib/frap/create_base.rb
+- lib/frap/create_resource.rb
 - lib/frap/generators/config.rb
 - lib/frap/generators/flutter_config.rb
-- lib/frap/generators/generate.rb
-- lib/frap/generators/resource.rb
+- lib/frap/generators/flutter_resource.rb
 - lib/frap/generators/templates/config.erb
 - lib/frap/generators/templates/dart/main.dart.erb
-- lib/frap/generators/templates/dart/src/app_bloc.dart.erb
-- lib/frap/generators/templates/dart/src/app_module.dart.erb
-- lib/frap/generators/templates/dart/src/app_widget.dart.erb
-- lib/frap/generators/templates/dart/src/home/home_bloc.dart.erb
-- lib/frap/generators/templates/dart/src/home/home_module.dart.erb
-- lib/frap/generators/templates/dart/src/home/home_page.dart.erb
+- lib/frap/generators/templates/dart/src/animations/slide_right_route.dart.erb
+- lib/frap/generators/templates/dart/src/app.dart.erb
+- lib/frap/generators/templates/dart/src/config/router.dart.erb
+- lib/frap/generators/templates/dart/src/constants/pages_list.dart.erb
+- lib/frap/generators/templates/dart/src/constants/routing.dart.erb
+- lib/frap/generators/templates/dart/src/screens/base.dart.erb
+- lib/frap/generators/templates/dart/src/screens/undefined_route_screen.dart.erb
+- lib/frap/generators/templates/dart/src/widgets/base_app_bar.dart.erb
+- lib/frap/generators/templates/dart/src/widgets/popup_menu_widget.dart.erb
 - lib/frap/version.rb
 homepage: https://github.com/flippakitten/frap
 licenses:

data/lib/frap/generators/resource.rb

@@ -1,42 +0,0 @@
-require 'thor'
-
-module Frap
-  module Generators
-    class Resource
-      attr_accessor :name, :attributes, :options
-
-      def initialize(name, options)
-        @name = name
-        @options = options
-      end
-
-      def create_resource
-        generate_rails_resource if options['rails']
-        generate_flutter_resource if options['flutter']
-      end
-
-      private
-
-      def generate_rails_resource
-
-
-        puts "TODO: rails g resource #{fields}"
-      end
-
-      def generate_flutter_resource
-        puts "TODO: frap g flutter resource #{fields}"
-      end
-
-      def fields
-        @fields ||= build_fields
-      end
-
-      def build_fields
-        fields_string = ''
-        options[:attributes].each { |k, v| fields_string << "#{k}:#{v} " }
-
-        return fields_string
-      end
-    end
-  end
-end

data/lib/frap/generators/templates/dart/src/app_bloc.dart.erb

@@ -1,9 +0,0 @@
-import 'package:bloc_pattern/bloc_pattern.dart';
-
-class AppBloc extends BlocBase {
-//dispose will be called automatically by closing its streams
-  @override
-  void dispose() {
-    super.dispose();
-  }
-}

data/lib/frap/generators/templates/dart/src/app_module.dart.erb

@@ -1,19 +0,0 @@
-import 'package:bloc_pattern/bloc_pattern.dart';
-import 'package:flutter/material.dart';
-import 'package:<%= folder_name %>/src/app_widget.dart';
-import 'package:<%= folder_name %>/src/app_bloc.dart';
-
-class AppModule extends ModuleWidget {
-  @override
-  List<Bloc> get blocs => [
-    Bloc((i) => AppBloc()),
-  ];
-
-  @override
-  List<Dependency> get dependencies => [];
-
-  @override
-  Widget get view => AppWidget();
-
-  static Inject get to => Inject<AppModule>.of();
-}

data/lib/frap/generators/templates/dart/src/app_widget.dart.erb

@@ -1,15 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:<%= folder_name %>/src/home/home_module.dart';
-
-class AppWidget extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      title: '<%= name.split(/ |\_|\-/).map(&:capitalize).join(' ') %> App',
-      theme: ThemeData(
-        primarySwatch: Colors.blue,
-      ),
-      home: HomeModule(),
-    );
-  }
-}

data/lib/frap/generators/templates/dart/src/home/home_bloc.dart.erb

@@ -1,9 +0,0 @@
-import 'package:bloc_pattern/bloc_pattern.dart';
-
-class HomeBloc extends BlocBase {
-  //dispose will be called automatically by closing its streams
-  @override
-  void dispose() {
-    super.dispose();
-  }
-}

data/lib/frap/generators/templates/dart/src/home/home_module.dart.erb

@@ -1,19 +0,0 @@
-import 'package:<%= folder_name %>/src/home/home_bloc.dart';
-import 'package:bloc_pattern/bloc_pattern.dart';
-import 'package:flutter/material.dart';
-import 'package:<%= folder_name %>/src/home/home_page.dart';
-
-class HomeModule extends ModuleWidget {
-  @override
-  List<Bloc> get blocs => [
-    Bloc((i) => HomeBloc()),
-  ];
-
-  @override
-  List<Dependency> get dependencies => [];
-
-  @override
-  Widget get view => HomePage();
-
-  static Inject get to => Inject<HomeModule>.of();
-}

data/lib/frap/generators/templates/dart/src/home/home_page.dart.erb

@@ -1,20 +0,0 @@
-import 'package:flutter/material.dart';
-
-class HomePage extends StatefulWidget {
-  @override
-  _HomePageState createState() => _HomePageState();
-}
-
-class _HomePageState extends State<HomePage> {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text("Home"),
-      ),
-      body: Center(
-        child: Text('<%= folder_name %> Home'),
-      ),
-    );
-  }
-}