faalis 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96a221ac8ba2334be76518f59e2935c54e1f68e9
-  data.tar.gz: e4114d9aa9636432ac1df0553a68df1054900e58
+  metadata.gz: 5b6bebb09df183b7dee476937557f6891913cb06
+  data.tar.gz: 7641a768cd23e508dd287ab678301916716259f8
 SHA512:
-  metadata.gz: 898ca6f74b5ba2bb6c3aaf28d425f9f1800683547a96a28258421ecef00a71b913a7ded913c881b0779c9fef2062ff72824c8191b6281b00fc9bd3a6f411e610
-  data.tar.gz: a85c348da16d744753756a9f6e2d8f3ae51546a122a92598c4c81d808ddfc70d7929830158e4b44f4259316ca79898831c62aed4c63429d1c8c478ace2f6199f
+  metadata.gz: 25e2961ee63d2a0e48fa2419246207f3345dcc25a27bbc216b677752dc89400400e53f81e81316e6cf3c5cecabd1755ffad90355df42db71c3f5a6735915c4c8
+  data.tar.gz: 6e02192d12bc51edbe48c1dd46db63a9818c90d31698aa24a13c153148504f7f1bd91c701f1c82709cc378cac10409d24bec37a1aeffa05ab645e9484866fc27

data/app/assets/javascripts/faalis/dashboard/modules/fields/string.js

@@ -9,6 +9,19 @@ String_.directive('stringField', ["$filter", "gettext", function($filter, gettex
         var ltr = is_ltr();
         scope.element_id = "id_" + scope.field;
         scope.msg_element_id = "id_" + scope.field + "_msg";
+        scope.show_help_btn = false;
+        scope.show_help_text = true;
+        // Decide to see help text or help button
+        if (scope.options === undefined) {
+            scope.options = {};
+        }
+
+        if ("help_text" in scope.options) {
+            if ("show_help_btn" in scope.options && scope.options.show_help_btn === true) {
+                scope.show_help_btn = true;
+                scope.show_help_text = false;
+            }
+        }
 
         if (scope.on_change !== undefined) {
             // Watch event changes
@@ -18,6 +31,27 @@ String_.directive('stringField', ["$filter", "gettext", function($filter, gettex
             }, true);
         }
 
+        scope.help_btn_clicked = function() {
+            if ("show_help_callback" in scope.options) {
+                scope.options.show_help_btn();
+            }
+            else {
+                scope.show_help_text = !scope.show_help_text;
+            }
+        };
+
+        scope.have = function(ob, element) {
+          if (ob !== undefined) {
+            if (element in ob) {
+                return true;
+            }
+            else {
+                return false;
+            }
+          }
+          return false;
+        };
+
     }
     // Actual object of <string-field> directive
     return {
@@ -25,7 +59,16 @@ String_.directive('stringField', ["$filter", "gettext", function($filter, gettex
         replace: true,
         restrict: "E",
         scope: {
+            // you can control the buttons and help
+            // message of field here. for example you can use `help_text` to
+            // show an small help under the control and you can set `show_help_btn`
+            // to true to show an help button.
+            // options is optional (notice '=?')
+            options: '=?',
+
+            // Css classes to apply on element
             cssClasses: '=cssClass',
+
             // A call back to pass to field ng-change directive
             on_change: "@onChange",
             // fieldname

data/app/assets/stylesheets/faalis/base.css.scss

@@ -274,7 +274,7 @@ small.error {
       padding: 2px 5px;
       color: $darkgray;
       cursor: pointer;
-      opacity: 0.3;
+      opacity: 0.4;
       @include transition(opacity 300ms linear 0ms);
       &:hover {
          opacity: 1;
@@ -287,8 +287,29 @@ small.error {
             opacity: 1;
             @include transition(opacity 300ms linear 0ms);
          }
+        .btntitle {
+          padding: 0;
+        }
+
       }
    }
+
+}
+
+.extra_links {
+   .option_item {
+      font-size: 0.7em;
+      color: $darkgray;
+      cursor: pointer;
+      a {
+        padding: 2px 4px;
+        .btntitle {
+          padding: 0;
+        }
+
+      }
+   }
+
 }
 
 .helptext {

data/app/views/angularjs_templates/fields/string/string.html

@@ -1,4 +1,22 @@
 <div>
   <input id="{{ element_id }}" ng-model="model" name="{{ field }}" ng-required="required" type="text" class="{{cssClasses}}" />
+  <div class="row">
+    <div class="float-left small-7 column">
+      <span class="helptext" ng-if="options.help_text && show_help_text">{{ options.help_text }}</span>
+    </div>
+    <div class="float-right small-5 column extra_links text-right" ng-if="have(options, 'links')">
+      <span ng-click="help_btn_clicked()" ng-if="show_help_btn">
+        <i class="fa fa-question"></i>
+      </span>
+      <span ng-repeat="item in options.links" class="option_item">
+        <a class="{{ item.link_class }}" ng-click="item.action()" ng-if="have(item, 'action')">
+          <i class="{{ item.icon || '' }}"></i> <span class="btntitle" ng-if="have(item, 'title')"><span translate>{{ item.title }}</span></span>
+        </a>
+        <a class="{{ item.link_class }}" ng-href="#{{ item.url }}" target="_blank" ng-if="have(item, 'url')">
+          <i class="{{ item.icon || '' }}"></i> <span class="btntitle" ng-if="have(item, 'title')"><span translate>{{ item.title }}</span></span>
+        </a>
+      </span>
+    </div>
+  </div>
   <small id="{{ msg_element_id }}"></small>
 </div>

data/lib/faalis/engine.rb

@@ -19,8 +19,8 @@
 require 'fast_gettext'
 require 'modernizr-rails'
 require "compass-rails"
-#require 'zurb-foundation'
-require 'foundation-rails'
+require 'zurb-foundation'
+#require 'foundation-rails'
 require "font-awesome-rails"
 require "devise"
 require "warden"

data/lib/faalis/generators/concerns.rb

@@ -8,3 +8,4 @@ require "faalis/generators/concerns/resource_name"
 require "faalis/generators/concerns/angular"
 require "faalis/generators/concerns/tabs"
 require "faalis/generators/concerns/model"
+require "faalis/generators/concerns/json_input"

data/lib/faalis/generators/concerns/angular.rb

@@ -5,20 +5,20 @@ module Faalis
 
         def self.included(base)
           # Path to js_scaffold target inside 'app/assets/javascripts/'
-          base.class_option :path, :type => :string, :default => "", :desc => "Path to js_scaffold target inside 'app/assets/javascripts/'"
+          #base.class_option :path, :type => :string, :default => "", :desc => "Path to js_scaffold target inside 'app/assets/javascripts/'"
 
           # Path to js_scaffold target
-          base.class_option :raw_path, :type => :string, :default => "", :desc => "Path to js_scaffold target"
+          #base.class_option :raw_path, :type => :string, :default => "", :desc => "Path to js_scaffold target"
         end
 
         private
 
 
         def angularjs_app_path
-          if options[:raw_path] != ""
-            options[:raw_path]
-          elsif options[:path] != ""
-            "app/assets/javascripts/#{options[:path]}/"
+          if not resource_data["raw_path"].blank?
+            resource_data["raw_path"]
+          elsif not resource_data["path"].blank?
+            "app/assets/javascripts/#{resource_data['path']}/"
           else
             path = Faalis::Engine.dashboard_js_manifest.split("/")[0..-2].join("/")
             "app/assets/javascripts/#{path}/"

data/lib/faalis/generators/concerns/bulk.rb

@@ -5,31 +5,26 @@ module Faalis
 
         def self.included(base)
           # Fields to use in in bulk edit, comma separated
-          base.class_option :bulk_fields, :type => :string, :default => "", :desc => "Fields to use in in bulk edit, comma separated"
+          #base.class_option :bulk_fields, :type => :string, :default => "", :desc => "Fields to use in in bulk edit, comma separated"
 
           # No bulk edit needed
-          base.class_option :no_bulk, :type => :boolean, :default => false, :desc => "No bulk edit needed"
+          #base.class_option :no_bulk, :type => :boolean, :default => false, :desc => "No bulk edit needed"
         end
 
         private
 
         # Returns fields which is needed to be in bulk edit
         def bulk_edit_fields
-          unless options[:bulk_fields].empty?
-            bfields = options[:bulk_fields].split(",")
-            fields_ = fields_hash
-            bfields.each do |f|
-              unless fields_.include? f
-                raise ::Exception.new "'#{f}' is not in scaffold fields."
-              end
-            end
-            return bfields
-          else
+          fields_with("bulk", true)
+        end
 
-            return self.send(:fields).collect {|f| f[0]}
+        def no_bulk?
+          if bulk_edit_fields.length > 0
+            true
+          else
+            false
           end
         end
-
       end
     end
   end

data/lib/faalis/generators/concerns/dependency.rb

@@ -5,9 +5,12 @@ module Faalis
 
         def self.included(base)
           # Dependencies of Angularjs module, comma separated
-          base.class_option :deps, :type => :string, :default => "", :desc => "Dependencies of Angularjs module, comma separated"
+          #base.class_option :deps, :type => :string, :default => "", :desc => "Dependencies of Angularjs module, comma separated"
         end
 
+        def deps
+          resource_data[:deps]
+        end
       end
     end
   end

data/lib/faalis/generators/concerns/json_input.rb

@@ -0,0 +1,39 @@
+require 'json'
+
+
+module Faalis
+  module Generators
+    module Concerns
+      # This module Provide an argument for generator which
+      # is needed by other `Concerns`.
+      #
+      # Each Concern will have its own
+
+      module JsonInput
+
+        def self.included(base)
+          # Name of the resource to create.
+          base.argument :jsonfile , :type => :string, :required => true
+        end
+
+        private
+
+        def json_file_data
+          path = File.expand_path(jsonfile)
+          File.read(path)
+        end
+
+        def resource_data
+          if @data
+            @data
+          else
+            @data = JSON.parse(json_file_data)
+            @data
+          end
+        end
+
+
+      end
+    end
+  end
+end

data/lib/faalis/generators/concerns/menu.rb

@@ -5,22 +5,13 @@ module Faalis
 
         def self.included(base)
           # Provide menu items which should be in sidebar. format: menu1:url,menu2:url
-          base.class_option :menu, :type => :string, :default => "", :desc => "Provide menu items which should be in sidebar. format: menu1:url,menu2:url"
+          #base.class_option :menu, :type => :string, :default => "", :desc => "Provide menu items which should be in sidebar. format: menu1:url,menu2:url"
         end
 
         private
 
-        def parse_menu(menu)
-          regex = /([^:{}]+){1}\:([^:\{\}]+)(?:{(.*)})?/i
-          model = nil
-          if menu =~ regex
-            title = $1
-            url = $2
-            model = $3
-            return title, url, model
-          else
-            Raise Exception.new "Menu items format should be like 'name:url{model}'. Model part is optional"
-          end
+        def has_menu?
+          resource_data.include? "menu"
         end
 
       end

data/lib/faalis/generators/concerns/model.rb

@@ -5,19 +5,19 @@ module Faalis
 
         def self.included(base)
           # Fields to use in in bulk edit, comma separated
-          base.class_option :model, :type => :string, :default => "", :desc => "Model name to use"
+          #base.class_option :model, :type => :string, :default => "", :desc => "Model name to use"
 
         end
 
         private
 
         def model_specified?
-          not options[:model].empty?
+          resource_data.include? "model"
         end
 
         def model
           if model_specified?
-            options[:model]
+            resource_data["model"]
           else
             ""
           end

data/lib/faalis/generators/concerns/parent.rb

@@ -5,14 +5,14 @@ module Faalis
 
         def self.included(base)
           # Specify the parent resource if there was any
-          base.class_option :parent, :type => :string, :default => "", :desc => "Specify the parent resource if there was any"
+          #base.class_option :parents, :type => :string, :default => "", :desc => "Specify the parent resource if there was any"
         end
 
         private
 
         # check for parent
         def parent?
-          if options[:parent] != ""
+          unless resource_data["parents"].empty?
             return true
           end
           false
@@ -25,7 +25,7 @@ module Faalis
 
         def parents
           if parent?
-            _parents = options[:parent].split(",")
+            _parents = resource_data["parents"]
             _parents.collect do |p|
               trim_parent_path(p)
             end

data/lib/faalis/generators/concerns/required.rb

@@ -5,16 +5,13 @@ module Faalis
 
         def self.included(base)
           # Non optional fields, comma separated
-          base.class_option :required, :type => :string, :default => "", :desc => "Non optional fields, comma separated"
+          #base.class_option :required, :type => :string, :default => "", :desc => "Non optional fields, comma separated"
         end
 
         private
 
         def required_fields
-          if not options[:required].empty?
-            return options[:required].split(",")
-          end
-          []
+          fields_with("required", true)
         end
       end
     end

data/lib/faalis/generators/concerns/resource_fields.rb

@@ -10,7 +10,7 @@ module Faalis
           # An array of resource fields. fields should be separated by space
           # each filed should be in this format `field_name:field_type[:extra_info]
           # Relation options should be like `{key: value, key2: elem1;elem2, key3: value3}`
-          base.argument :resource_fields, type: :array, default: [], banner: "fields[:types[:to[{relation_options}]"
+          #base.argument :resource_fields, type: :array, default: [], banner: "fields[:types[:to[{relation_options}]"
 
         end
 
@@ -18,19 +18,12 @@ module Faalis
         # An array of fields like
         # [name, type]
         def fields
-          pattern = /(?<name>[^:\{\}]+):(?<type>[^:\{\}]+)[:]?(?:(?<to>[^:\{\}]+)(?:\{(?<options>.+)\})*)*/i
           fields = []
-          resource_fields.each do |field|
-            matched = pattern.match field
-            name = type = to = options = ""
-            if matched
-              name = matched["name"]
-              type = matched["type"]
-              to = matched["to"]
-              options = matched["options"] || ""
-            else
-              raise Exception.new "Fields should be in  FIELD_NAME:FIELD_TYPE[:RELATION[{OPTIONS}]]"
-            end
+          resource_data["fields"].each do |field|
+            name = field["name"]
+            type = field["type"]
+            to = field["to"]
+            options = field["options"] || {}
 
             if ["belongs_to", "has_many", "in"].include? type
               type = Relation.new(type, to, options)
@@ -46,7 +39,7 @@ module Faalis
         end
 
         def grid_fields
-          fields
+          fields_with("view_in_grid", true)
         end
 
         # Return an string to use as a function parameters each
@@ -88,6 +81,24 @@ module Faalis
           result
         end
 
+        def fields_with(attr, value)
+          fields.select do |f|
+            if f.include? attr
+              if f[attr] == value
+                true
+              else
+                false
+              end
+            else
+              false
+            end
+
+          end
+        end
+
+        def no_filter?
+          resource_data.include? "no_filter" &&  resource_data["no_filter"]
+        end
       end
     end
   end

data/lib/faalis/generators/concerns/resource_name.rb

@@ -5,35 +5,35 @@ module Faalis
 
         def self.included(base)
           # Name of the resource to create.
-          base.argument :resource_name, :type => :string, :required => true
+          #base.argument :resource_name, :type => :string, :required => true
         end
 
         private
 
         # Path to the resource
         def resource_path
-          path_parts = resource_name.split("/")
+          path_parts = resource_data["name"].split("/")
           if path_parts.length > 1
             return "#{path_parts(0..-2).join("/")}/#{path_parts[-1].underscore}"
           end
-          resource_name.underscore
+          resource_data["name"].underscore
         end
 
         # Url of resource
         def resource_url
-          path_parts = resource_name.split("/")
+          path_parts = resource_data["name"].split("/")
           if path_parts.length > 1
             return "#{path_parts(0..-2).join("/")}/#{path_parts[-1].pluralize.underscore}"
           end
-          resource_name.pluralize.underscore
+          resource_data["name"].pluralize.underscore
         end
 
         def resource
-          path_parts = resource_name.split("/")
+          path_parts = resource_data["name"].split("/")
           if path_parts.length > 1
             return path_parts[-1].camelize
           end
-          resource_name.camelize
+          resource_data["name"].camelize
         end
 
       end

data/lib/faalis/generators/concerns/tabs.rb

@@ -5,7 +5,7 @@ module Faalis
 
         def self.included(base)
           # Add tabs to 'new' view of scaffold. format: --tabs tab1:'field1;field2',tab2 Note: __all__ field include all fileds.
-          base.class_option :tabs, :type => :string, :default => "", :desc => "Add tabs to 'new' view of scaffold. format: --tabs tab1:'field1;field2',tab2 Note: __all__ field include all fileds."
+          #base.class_option :tabs, :type => :string, :default => "", :desc => "Add tabs to 'new' view of scaffold. format: --tabs tab1:'field1;field2',tab2 Note: __all__ field include all fileds."
         end
 
         private
@@ -13,15 +13,12 @@ module Faalis
         # Process the user provided tabs
         # @return a Hash of tabs like
         def tabs
-          if options[:tabs].present?
-            tabs = options[:tabs].split(",")
+          if resource_data.include? "tabs"
+            tabs = resource_data"tabs"
             result = {}
             tabs.each do |tab|
-              name, fields = tab.split(":")
-              fields_list = []
-              unless fields.nil?
-                fields_list = fields.split(";")
-              end
+              name = tab["name"]
+              fields_list = fields_with("tab", tab["id"])
               result[name] = fields_list
             end
             return result
@@ -31,7 +28,7 @@ module Faalis
         end
 
         def any_tabs?
-          options[:tabs].present?
+          resource_data.include? "tabs"
         end
 
       end

data/lib/faalis/generators/dashboard_scaffold.rb

@@ -6,6 +6,7 @@ module Faalis
     class DashboardScaffold < Rails::Generators::Base
 
       include ActionView::Helpers::TextHelper
+      include Faalis::Generators::Concerns::JsonInput
       include Faalis::Generators::Concerns::ResourceName
       include Faalis::Generators::Concerns::ResourceFields
       include Faalis::Generators::Concerns::Menu

data/lib/faalis/generators/fields/relation.rb

@@ -14,14 +14,14 @@ module Faalis
       end
 
       def to
-        result = "'"
+        result = ""
         if options.include? "parents"
           field_parents.each do |parent|
             result = "#{result}/#{parent}/' + $scope.#{parent}_id + '"
           end
           result = "#{result}/"
         end
-        "#{result}#{@to}'"
+        "#{result}#{@to}"
       end
 
       def options

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = "0.19.0"
+  VERSION = "0.20.0"
 end

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

@@ -1,15 +1,15 @@
 <div class="details">
-    <% fields.each do |field_name, field_type| %>
+    <% fields.each do |f, field_type| %>
       <p>
       <% case field_type
-           when "belongs_to" %> <b translate><%= field_name.capitalize %> :</b> {{object.<%= field_name %>.name}}
+           when "belongs_to" %> <b translate><%= f.capitalize %> :</b> {{object.<%= f %>.name}}
       <% when "has_many" %><p>
-        <b translate><%= field_name.capitalize %> :</b>
+        <b translate><%= f.capitalize %> :</b>
         <ul>
-          <li ng-repeat="item in object.<%= field_name %>"> {{ item.name }}</li>
+          <li ng-repeat="item in object.<%= f %>"> {{ item.name }}</li>
         </ul>
       </p>
-      <% else %><b translate><%= field_name.capitalize %> :</b> {{object.<%= field_name %>}}
+      <% else %><b translate><%= f.capitalize %> :</b> {{object.<%= f %>}}
       <% end %></p>
     <% end %>
   <ul class="button-group float-right">

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

@@ -1,7 +1,7 @@
-<% unless options[:no_filter] %>
+<% unless no_filter? %>
 <filter config="filter_config" result="<%= resource.pluralize.underscore %>"></filter>
 <% end %>
-<% unless options[:no_bulk] %>
+<% unless no_bulk? %>
 <div ng-if="bulk_edit" class="fade_anim">
   <form id="bulk_form">
     <fieldset class="row clearmargin">
@@ -55,7 +55,7 @@
     </div>
 </div>
 <% end %>
-<list-view buttons="buttons" model="'<% if model_specified? %><%= model %><% else %><%= resource %><% end %>'" objects="<%= resource.pluralize.underscore %>" title-attribute="'<%= options[:title_field] %>'" details-template="details_template" item-per-page="10" on_delete="on_delete" column_defs="columns">
+<list-view buttons="buttons" model="'<% if model_specified? %><%= model %><% else %><%= resource %><% end %>'" objects="<%= resource.pluralize.underscore %>" title-attribute="'<%= resource_data["title_field"] %>'" details-template="details_template" item-per-page="10" on_delete="on_delete" column_defs="columns">
   <div class="small-6 column text-left clearpadding">
     <h3><i class="fa fa-group"></i> <span translate><%= resource.underscore.pluralize.humanize %></span></h3>
   </div>

data/lib/generators/faalis/templates/js/list_view/module.js.erb

@@ -1,26 +1,5 @@
-<% if is_in_engine? %>
-/* -----------------------------------------------------------------------------
-    Faalis - Basic website skel engine
-    Copyright (C) 2012-2013 Yellowen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
------------------------------------------------------------------------------ */
-
-<% end %>
 // <%= resource.pluralize %> Module
-var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "Filter", "Anim", "Fields",<% if options[:deps] %><% options[:deps].gsub(" ", "").split(",").each do |dependency| %> "<%= dependency.camelize %>", <% end %><% end %>]);
+var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "Filter", "Anim", "Fields",<% if resource_data[:deps] %><% resource_data[:deps].each do |dependency| %> "<%= dependency.camelize %>", <% end %><% end %>]);
 
 // <%= resource.pluralize %> configuration section ---------------------------
 <%= resource.pluralize %>.config(["$routeProvider", function($routeProvider){
@@ -44,17 +23,16 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
 
 // <%= resource %> index controller -------------------------------------------------------
 // This controller is responsible for list page (index)
-<%= resource.pluralize %>.controller("<%= resource %>Controller", ["$scope", "gettext", "Restangular", "catch_error", "$location", "$routeParams",
-                                      function($scope, gettext, API, catch_error, $location, $routeParams){
+<%= resource.pluralize %>.controller("<%= resource %>Controller", ["$scope", "gettext", "Restangular", "catch_error", "$location", "$routeParams", function($scope, gettext, API, catch_error, $location, $routeParams){
 
     <% parents.each do |parent| %>
-    $scope.<%= options[:parent] %>_id = $routeParams.<%= options[:parent] %>_id;
+    $scope.<%= parent %>_id = $routeParams.<%= parent %>_id;
     <% end %>
-    <% unless options[:no_filter] %>$scope.filter_config = {
+    <% unless no_filter? %>$scope.filter_config = {
         list: <% if parent? %>API.<% parents.each do |parent| %>one("<%= parent %>", $scope.<%= parent %>_id)<% end %>.all("<%= resource.pluralize.underscore %>")<% else %>API.all("<%= resource.pluralize.underscore %>")<% end %>
     };
     $scope.<%= resource.pluralize.underscore %> = [];<% end %>
-    <% unless options[:no_bulk] %>// Cache object for each field name possible values
+    <% unless no_bulk? %>// Cache object for each field name possible values
     $scope.cache = {};
 
     // Change event handler for field_name combobox in bulk edit
@@ -100,7 +78,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
             },
             route: "#<% parents.each do |p| %>/<%= p %>/" + $scope.<%= p %>_id + "<% end %>/<%= resource_url %>/new"
 
-         },<% unless options[:no_bulk] %>
+         },<% unless no_bulk? %>
         {
             title: gettext("Bulk Edit"),
             icon: "fa fa-edit",
@@ -136,7 +114,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
             }
         }
 
-    ];<% unless options[:no_bulk] %>
+    ];<% unless no_bulk? %>
 
     /*
      * On bulk save event
@@ -216,7 +194,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
             });
 
     };
-    <% unless options[:no_filter] %>/*<% end %>
+    <% unless no_filter? %>/*<% end %>
     <% if parent? %>API.<% parents.each do |parent| %>one("<%= parent %>", $scope.<%= parent %>_id)<% end %>.all("<%= resource.pluralize.underscore %>").getList()<% else %>
     API.all("<%= resource.pluralize.underscore %>").getList()<% end %>
         .then(function(data){
@@ -224,7 +202,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
         }, function(data){
             catch_error(data);
         });
-     <% unless options[:no_filter] %>*/<% end %>
+     <% unless no_filter? %>*/<% end %>
 }]);
 
 <%= resource.pluralize %>.controller("Add<%= resource %>Controller", ["Restangular", "$scope", "$location", "$routeParams", "gettext", "catch_error", function(API, $scope, $location, $routeParams, gettext, catch_error){
@@ -245,8 +223,9 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
     <% fields.each do |name, type| %><% if ["belongs_to", "in", "has_many"].include? type %>
     $scope.<%= name %>_data = {
         type: '<%= type %>',<% if type == "in" %>
-        choices: _.sortBy([<% type.to.split(",").each do |choice| %>{name: "<%= choice.underscore %>", title: "<%= choice.humanize %>"},<% end %>]),<% else %>
-        to: <%= type.to %>,<% end %>
+        choices: _.sortBy([<% type.to.split(",").each do |choice| %>{name: "<%= choice.underscore %>", title: "<%= choice.humanize %>"},<% end %>]),
+  <% else %>
+        to: '<%= type.to %>',<% end %>
         name: '<%= name %>'
     };<% end %><% end %>
     <% fields.each do |name, type| %><% if type == "in" %>$scope.<%= name %>_choices = _.sortBy([<% type.to.split(",").each do |choice| %>
@@ -325,9 +304,9 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
 
     };
 }]);
-<% unless options[:menu].empty? %>
+<% if has_menu? %>
 <%= resource.pluralize %>.controller("<%= resource %>MenuController", ["gettext", function(gettext){
-    this.menu_items = [<% options[:menu].split(",").each do |menu| %><% title, url, model = parse_menu(menu) %>
-        {title: gettext("<%= title %>"), url: "<%= url %>"<% if model %>, permission: {action: "read", model: "<%= model %>"}<% end %>},<% end %>
+    this.menu_items = [<% resource_data["menu"].each do |menu| %>
+        {title: gettext("<%= meun["title"] %>"), url: "<%= menu["url"] %>"<% if menu.include? "model" %>, permission: {action: "<%= menu["perm_action"] || 'read' %>", model: "<%= menu["model"] %>"}<% end %>},<% end %>
         ];
 }]);<% end %>

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Sameer Rahmani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -138,19 +138,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: foundation-rails
+  name: zurb-foundation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -593,6 +593,7 @@ files:
 - lib/faalis/generators/concerns/angular.rb
 - lib/faalis/generators/concerns/bulk.rb
 - lib/faalis/generators/concerns/dependency.rb
+- lib/faalis/generators/concerns/json_input.rb
 - lib/faalis/generators/concerns/menu.rb
 - lib/faalis/generators/concerns/model.rb
 - lib/faalis/generators/concerns/parent.rb