faalis 1.0.0.alpha0 → 1.0.0.alpha1

data/lib/faalis/i18n.rb

@@ -21,7 +21,6 @@ module Faalis
 
   # I18n related utility functions
   class I18n
-
     RTL = [:fa, :ar]
 
     def self.direction(locale)
@@ -31,5 +30,11 @@ module Faalis
         'ltr'
       end
     end
+
+    module Locale
+      def self.default_url_options
+        { :locale => I18n.locale }
+      end
+    end
   end
 end

data/lib/faalis/middlewares.rb

@@ -0,0 +1 @@
+require 'faalis/middlewares/locale'

data/lib/faalis/middlewares/locale.rb

@@ -0,0 +1,29 @@
+module Faalis
+  module Middlewares
+
+    # Locale middleware for `Faalis`. This middleware try to set
+    # the locale from url.
+    class Locale
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        req = Rack::Request.new(env)
+
+        # Check whether locale is presence or not.
+        if locale = req.path_info.match(/^([a-z]{2})\/.*/)
+          # If its set the default locale to it.
+          locale = locale[1]
+        else
+          # Use pre-defined default if it isn't
+          locale = ::I18n.default_locale
+        end
+
+        req.params['locale'] ||= locale
+        ::I18n.locale = locale
+        @app.call env
+      end
+    end
+  end
+end

data/lib/faalis/route.rb

@@ -1,34 +1,27 @@
+
 module Faalis
   class Routes
-    def self.define_api_routes(routes=Rails.application.routes)
+    # This class method will add `Faalis` routes to host application
+    # Router
+    def self.define_api_routes(routes = Rails.application.routes)
 
       routes.draw do
         scope 'module'.to_sym => 'faalis' do
-          namespace :api, :defaults => {:format => :json} do
+          # TODO: Add a dynamic solution for formats
+          namespace :api, defaults: {format: :json} do
             namespace :v1 do
-              get 'permissions', :to => 'permissions#index'
-              get 'permissions/user', :to => 'permissions#user_permissions'
-              resources :groups, :except => [:new]
-              resources :users, :except => [:new]
-              resource :profile, :except => [:new, :destroy]
+              get 'permissions', to: 'permissions#index'
+              get 'permissions/user', to: 'permissions#user_permissions'
+              resources :groups, except: [:new]
+              resources :users, except: [:new]
+              resource :profile, except: [:new, :destroy]
 
               get 'logs' => 'logs#index'
-              get 'workflows' => 'workflows#index'
-
-              resources :conversations, only: [:index, :show, :create, :destroy] do
-                collection do
-                  get ':box/box' => 'conversations#index'
-                  post 'trash' => 'conversations#trash'
-                  post 'untrash' => 'conversations#untrash'
-                end
-                member do
-                  post :reply
-                end
-              end
             end
           end
         end
       end
+
     end
   end
 end

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = '1.0.0.alpha0'
+  VERSION = '1.0.0.alpha1'
 end

data/lib/generators/faalis/install_all_generator.rb

@@ -22,15 +22,17 @@ module Faalis
     class InstallAllGenerator < Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
 
-      desc "Copy all the necessary files to use Faalis (migrations included)"
+      class_option :mongoid, type: :boolean, default: false, desc: 'Use mongoid with faalis'
+
+      desc 'Copy all the necessary files to use Faalis (migrations included)'
       hook_for :install_generator
 
       def copy_migrations
-        rake("faalis:install:migrations")
+        rake('faalis:install:migrations') unless options[:mongoid]
       end
 
       def copy_install
-        invoke "faalis:install"
+        invoke 'faalis:install'
       end
 
     end

data/lib/generators/faalis/install_generator.rb

@@ -61,6 +61,10 @@ module Faalis
         route 'Faalis::Routes.define_api_routes'
       end
 
+      def patch_application_controller
+        inject_into_class "app/controllers/application_controller.rb", ApplicationController, "  extend Faalis::I18n::Locale\n"
+      end
+
       def show_readme
         readme 'README' if behavior == :invoke
       end

data/lib/generators/faalis/js/install_i18n_generator.rb

@@ -28,7 +28,7 @@ module Faalis
 
         def copy_init_files
           template 'i18n/Gruntfile.js.erb', 'lib/tasks/grunt/Gruntfile.js'
-          copy_file 'i18n/fa.js', 'app/assets/javascripts/locale/'
+          copy_file 'i18n/fa.js', 'app/assets/javascripts/locales/fa.js'
         end
 
         def show_readme

data/lib/generators/faalis/scaffold_generator.rb

@@ -23,24 +23,28 @@ module Faalis
     class ScaffoldGenerator < Rails::Generators::Base
       include Faalis::Generators::Concerns::RequireFields
       include Faalis::Generators::Concerns::Parent
+      include Faalis::Generators::Concerns::Child
       include Faalis::Generators::Concerns::JsonInput
       include Faalis::Generators::Concerns::ResourceName
       include Faalis::Generators::Concerns::ResourceFields
+      include Faalis::Generators::Concerns::Globalize
+
 
       desc 'Create full faalis full scaffold'
-      # FIXME: These options should have :type and :desc or even default
+      # FIXME: These options should have :desc or even default
       #        value
-      class_option :no_model
-      class_option :no_route
-      class_option :no_controller
-      class_option :no_migration
-      class_option :no_asset
+      class_option :no_model, :type => :boolean
+      class_option :no_route, :type => :boolean
+      class_option :no_controller, :type => :boolean
+      class_option :no_migration, :type => :boolean
+      class_option :no_asset, :type => :boolean
 
-      # FIXME: Add method documents HERE
+      # This method will create full scaffold based on user options
       def create_scaffold
         if options.empty?
           # TODO: ....
         end
+        # TODO: Show error if in class_option migration is selected by model not
         create_model unless options[:no_model]
         create_route unless options[:no_route]
         create_controller unless options[:no_controller]
@@ -53,7 +57,6 @@ module Faalis
       # It does not have any relation to Faalis
       # TODO: Check for better way
       def create_controller
-        #invoke "scaffold_controller", resource_data["name"]
         if options[:no_asset]
           `rails g scaffold_controller #{resource_data["name"]} --skip`
         else
@@ -72,61 +75,88 @@ module Faalis
         result = []
         all_fields = []
         relations = "\n"
-        fields.each do |name, type, to|
 
+        fields.each do |name, type, to|
           case type
           when 'belongs_to'
             type_ = 'integer'
             if to.singularize != name
-              relations << "belongs_to :#{name.singularize},
+              relations << "  belongs_to :#{name.singularize},
               :class_name => \"#{to.singularize.capitalize}\"\n"
             else
-              relations << "belongs_to :#{to.singularize}\n"
+              relations << "  belongs_to :#{to.singularize}\n"
             end
             name_ = "#{name.singularize}_id"
             result << [name_, type_]
 
-          when 'text', 'integer', 'string', 'boolean', 'datetime'
+          when 'text', 'integer', 'string', 'boolean', 'datetime', 'date', 'float'
             result << [name, type]
 
           when 'image'
             generate "paperclicp #{resource_data['name']} #{name}"
-            relations << "has_attached_file :#{name}\n"
-            relations << "validates_attachment_content_type :image, :content_type => %w(image/jpeg image/jpg image/png),:less_than => 1.megabytes]\n"
+            relations << "  has_attached_file :#{name}\n"
+            relations << "  validates_attachment_content_type :#{name},
+     content_type: %w(image/jpeg image/jpg image/png),
+     less_than:  1.megabytes]\n"
+            # TODO: Run this generator just once for all images
+            `rails generate paperclip #{resource_data['name']} #{name}`
           when 'tag'
             rake "rake acts_as_taggable_on_engine:install:migrations"
-            relations << "acts_as_taggable_on :#{name}\n"
+            relations << "  acts_as_taggable_on :#{name}\n"
             result << [name, 'string']
 
           when 'in'
             result << [name, 'string']
 
           when 'has_many'
-            relations << "has_and_belongs_to_many :#{to}\n"
-            say_status 'warn', "There is a many to many relation between #{resource_data['name']} to #{to}, You should create it manually in model files"
+            relations << "  has_and_belongs_to_many :#{to}\n"
+            say_status 'warn', "There is a many to many relation between #{resource_data['name']} and #{to},
+ You should create it manually in model files"
 
           end
+        end
 
-          all_fields = result.collect do |x|
-            x.join(':')
+        if parent?
+          parents.each do |parent|
+            result << ["#{parent.singularize}_id", "integer"]
+            relations << "  belongs_to :#{parent.singularize}\n"
           end
+        end
 
+
+        childs.each do |child|
+          relations << "  has_many :#{child.pluralize}\n"
         end
 
-        if parent?
-          all_fields << ["#{resource_data["parents"]}_id", "integer"]
+        all_fields = result.collect do |x|
+          x.join(':')
         end
 
-        invoke('active_record:model', [resource_data['name'], *all_fields], {
+        # Load all globalize field and create a string to adding in model
+        globalizes = "\n  translates "+
+          globalize_fields.map { |field | ":#{field['name'].underscore}" }.join(", ")
+
+
+
+        invoke('active_record:model', [resource_data['name'].underscore, *all_fields], {
                  migration: !options[:no_migration], timestamps: true
                })
+        if globalize_fields.any?
+          create_globalize_migration
+        end
+
         if File.exist?("app/models/#{resource_data["name"]}.rb")
-          inject_into_file "app/models/#{resource_data["name"]}.rb", after: 'Base' do
-            relations
+
+          inject_into_file "app/models/#{resource_data["name"].underscore}.rb", after: 'Base' do
+
+            globalize_fields.empty? ? relations : relations + globalizes
           end
         else
-          puts "Could not find file app/models/#{resource_data["name"]}"
+          puts "Could not find file app/models/#{resource_data["name"].underscore}"
         end
+
+
+
       end
 
       #Invoke Faalis list view generator
@@ -134,6 +164,23 @@ module Faalis
         invoke 'faalis:js:list_view', [jsonfile]
 
       end
+
+      def create_globalize_migration
+        `rails g migration add_globalize_to_#{resource_data["name"].underscore} `
+        Dir["#{Rails.root}/db/migrate/**/*globalize*.rb"].each {|file| require file }
+        klass = "add_globalize_to_#{resource_data['name']}".underscore.camelize
+
+        migration_class = "::#{klass}".constantize
+        migration_path = migration_class.instance_method(:change).source_location
+
+        fields = globalize_fields.map { |field | ":#{field['name']} => :#{field['type']}" }.join(", ")
+
+        inject_into_file migration_path[0], after: 'change' do
+          "\n    #{resource_data['name'].camelize}"+
+            '.create_translation_table! '+
+            fields
+        end
+      end
     end
   end
 end

data/lib/generators/faalis/templates/i18n/Gruntfile.js.erb

@@ -3,7 +3,7 @@ module.exports = function (grunt) {
         nggettext_extract: {
             pot: {
                 files: {
-                    'app/assets/javascripts/locale/templates.pot': ['app/views/angularjs_templates/**/*.html',
+                    'app/assets/locales/templates.pot': ['app/views/angularjs_templates/**/*.html',
                                                         'app/views/angularjs_templates/**/*.html.erb',
                                                         'app/assets/javascripts/**/*.js',
                                                         'app/assets/javascripts/**/*.js',
@@ -18,7 +18,7 @@ module.exports = function (grunt) {
                     module: "Dashboard"
                 },
                 files: {
-                    'app/assets/javascripts/locale/translations.fa.js': ['app/assets/locale/*.fa.pot']
+                    'app/assets/javascripts/locales/translations.fa.js': ['app/assets/locales/*.fa.pot']
                 }
             }
         }

data/lib/generators/faalis/templates/i18n/fa.js

@@ -1,3 +1,3 @@
 // require translations for your specific languages.
-//= require faalis/locale/translations.fa
-//= require locale/translations.fa
+//= require faalis/locales/translations.fa
+//= require locales/translations.fa

data/lib/generators/faalis/templates/js/list_view/details.html.erb

@@ -1,9 +1,13 @@
 <div class="details">
-    <% fields.each do |f, field_type| %>
+  <% if child? %>
+      <div class="row">
+    <div class="small-8 column">
+  <% end %>
+  <% fields.each do |f, field_type| %>
       <p>
-      <% case field_type
+        <% case field_type
            when "belongs_to" %> <b translate><%= f.capitalize %> :</b> {{object.<%= f %>.name}}
-      <% when "has_many" %><p>
+        <% when "has_many" %><p>
         <b translate><%= f.capitalize %> :</b>
         <ul>
           <li ng-repeat="item in object.<%= f %>"> {{ item.name }}</li>
@@ -12,6 +16,25 @@
       <% else %><b translate><%= f.capitalize %> :</b> {{object.<%= f %>}}
       <% end %></p>
     <% end %>
+
+    <% if child? %>
+          </div>
+
+    <div class="small-4 column">
+      <ul>
+      <% childs.each do |child| %>
+
+        <li>
+          <a ng-href="#/<%= resource_data['name'].pluralize %>/{{ object.id }}/<%= child.pluralize %>" class="small">
+            <span translated><%= child.split('_').tap{|a| a[0].upcase }.join(' ') %></span>
+          </a>
+        </li>
+      <% end %>
+      </ul>
+    </div>
+  </div>
+
+      <% end %>
   <ul class="button-group float-right">
     <a ng-href="#<% parents.each do |p| %>/<%= p %>/{{ this.$parent.$parent.$parent.$parent.<%= p %>_id }}<% end %>/<%= resource_url %>/{{ object.id }}/edit" class="small">
       <span class="fa fa-edit"></span> <span translated>Edit</span>

data/lib/generators/faalis/templates/views/create.json.jbuilder.erb

@@ -1,2 +1,3 @@
-json.extract! @<%= resource.underscore %>, :id<%= fields_as_params %>
+json.id @<%= resource.underscore %>.id.to_s
+json.extract! @<%= resource.underscore %><%= fields_as_params %>
 <% fields.each do |name, type| %><% if type == "has_many" %>json.<%= name %> @<%= resource.underscore %>.<%= name %>, :id, :name<% end %><% end %>

data/lib/generators/faalis/templates/views/index.json.jbuilder.erb

@@ -1,5 +1,6 @@
 json.array! @<%= resource.pluralize.underscore %> do |<%= resource.underscore %>|
-  json.extract! <%= resource.underscore %>, :id<%= fields_as_params %><% fields.each do |name, type| %><% case type
+  json.id <%= resource.underscore %>.id.to_s
+  json.extract! <%= resource.underscore %><%= fields_as_params %><% fields.each do |name, type| %><% case type
   when "belongs_to" %>
   json.<%= name %> do
     if <%= resource.underscore %>.<%= name %>
@@ -7,5 +8,6 @@ json.array! @<%= resource.pluralize.underscore %> do |<%= resource.underscore %>
       json.name <%= resource.underscore %>.<%= name %>.name
     end
   end
-<% when "has_many" %>  json.<%= name %> <%= resource.underscore %>.<%= name %>, :id, :name<% end %><% end %>
+<% when "has_many" %>
+ json.<%= name %> <%= resource.underscore %>.<%= name %>, :id, :name<% end %><% end %>
 end

data/lib/generators/faalis/templates/views/show.json.jbuilder.erb

@@ -1,4 +1,5 @@
-json.extract! @<%= resource.underscore %>, :id<%= fields_as_params %><% fields.each do |name, type| %>
+json.id @<%= resource.underscore %>.id.to_s
+json.extract! @<%= resource.underscore %><%= fields_as_params %><% fields.each do |name, type| %>
 <% case type
 when "belongs_to" %>
 json.partial! 'faalis/relations/belongs_to', object: @<%= resource.underscore %>.<%= name %>, :name => :<%= name %>, :fields => [:id, :name]

data/lib/generators/faalis/templates/views/update.json.jbuilder.erb

@@ -1,4 +1,5 @@
-json.extract! @<%= resource.underscore %>, :id<%= fields_as_params %>
+json.id @<%= resource.underscore %>.id.to_s
+json.extract! @<%= resource.underscore %><%= fields_as_params %>
 <% fields.each do |name, type| %><% if type == "has_many" %>json.<%= name %> @<%= resource.underscore %>.<%= name %>, :id, :name
 <% end %><% if type == "belongs_to" %>
 json.partial! 'faalis/relations/belongs_to', object: @<%= resource.underscore %>.<%= name %>, :name => :<%= name %>, :fields => [:id, :name]

data/lib/tasks/faalis_tasks.rake

@@ -1,40 +1,38 @@
-namespace :faalis do
+namespace :js do
+  namespace :i18n do
+
+    desc "Collect all the strings which marked for translation from javascript files"
+    task :collect do
+      base = "--base #{Rails.root}/"
+      puts "grunt --gruntfile #{Rails.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_extract -d -v"
+      puts `grunt --gruntfile #{Rails.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_extract -d -v`
+    end
+
+    desc "Compile all the strings which marked for translation in javascript files"
+    task :compile do
+      base = "--base #{Rails.root}/"
+      puts `grunt --gruntfile #{Rails.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_compile -d -v`
+    end
+  end
 
+end
+
+
+namespace :faalis do
   namespace :js do
     namespace :i18n do
-
       desc "Collect all the strings which marked for translation from javascript files"
       task :collect do
-        base = "--base #{Rails.root}/"
-        puts "grunt --gruntfile #{Rails.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_extract -d -v"
-        puts `grunt --gruntfile #{Rails.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_extract -d -v`
+        base = "--base #{Faalis::Engine.root}/"
+        puts "grunt --gruntfile #{Faalis::Engine.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_extract -d -v"
+        puts `grunt --gruntfile #{Faalis::Engine.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_extract -d -v`
       end
 
       desc "Compile all the strings which marked for translation in javascript files"
       task :compile do
-        base = "--base #{Rails.root}/"
-        puts `grunt --gruntfile #{Rails.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_compile -d -v`
+        base = "--base #{Faalis::Engine.root}/"
+        puts `grunt --gruntfile #{Faalis::Engine.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_compile -d -v`
       end
     end
-
-  end
-end
-
-
-namespace :js do
-  namespace :i18n do
-    desc "Collect all the strings which marked for translation from javascript files"
-    task :collect do
-      base = "--base #{Faalis::Engine.root}/"
-      puts "grunt --gruntfile #{Faalis::Engine.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_extract -d -v"
-      puts `grunt --gruntfile #{Faalis::Engine.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_extract -d -v`
-    end
-
-    desc "Compile all the strings which marked for translation in javascript files"
-    task :compile do
-      base = "--base #{Faalis::Engine.root}/"
-      puts `grunt --gruntfile #{Faalis::Engine.root}/lib/tasks/grunt/Gruntfile.js #{base} nggettext_compile -d -v`
-    end
-
   end
 end