faalis 0.21.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14da634aef8853abbd8af125b967c93b01c6e193
-  data.tar.gz: dd943a9315c2d293c90dc709bbd50fd4225a1b11
+  metadata.gz: 6e8d41e6694f09b9f411168fdc7c05b22d7c5b8e
+  data.tar.gz: b3d20ddff941a3df2083b5626b0ef4debb38498d
 SHA512:
-  metadata.gz: 9956fb8de054298606c4e51bd4cb259d140cf75203b3eb85c6f663789f447ad4109fae8745b5c978b4b14c4fd61fcb8d03b230d6622524448d4f821445eba028
-  data.tar.gz: 8fec4fb4f4858e8ff667c1b42a13833cc34a5b8eee6a60c41d158b491a5f5020a418311e7c5ed225b723d7e578857961afc183214d060ccfc8effc360d749344
+  metadata.gz: ef9024980abb5ec1328edf5ebe2a679c2c8651012bc2d68b60e2bd196e25e88c37634d86937303e90bb38c320f1e760afd485802d47cfa1cd5cca5c58f34b65a
+  data.tar.gz: bc7b648b808430fcab1809ad3f4d48d54105358af78cded20b5d4d700899d9191b35229ec5f41582d3c19162c4559ea1a36abd47cde9b859e05f98ee1795380e

data/app/models/faalis/concerns/assignment.rb

@@ -0,0 +1,16 @@
+module Faalis
+  module Concerns
+    # This **concern** provide the default query loading scope for model.
+    # Using this, you can make queries like key=value in http request
+    # and  Model.assignment(key: value) on you model.
+    module Assignment
+
+      def self.included(base)
+        base.scope :assignment_query, -> (field, value) do
+          base.where(field => value)
+       end
+      end
+
+    end
+  end
+end

data/lib/faalis/generators/concerns.rb

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

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

@@ -0,0 +1,38 @@
+module Faalis
+  module Generators
+    module Concerns
+      # This module adds `allow_query_on` key to json file which is an array
+      # of field name which you want to whitelist for query.
+      module AllowQueryOn
+
+        private
+
+
+        def allowed_fields
+          if allowed_fields_provided?
+            unless resource_data["allow_query_on"].is_a? Array
+              raise Exception.new "value of `allow_query_on` key should be an Array. "
+            end
+            fields = resource_data["allow_query_on"].collect do |f|
+              ":#{f}"
+            end
+            fields.join(" ,")
+          else
+            []
+          end
+        end
+
+        # Check for any allowed fields in json
+        def allowed_fields_provided?
+          if resource_data.include? "allow_query_on"
+            unless resource_data["allow_query_on"].nil?
+              return true
+            end
+          end
+          false
+        end
+
+      end
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module Faalis
         private
 
         def required_fields
-          fields_with("required", true)
+          fields_with("required", true).collect {|x| x["name"]}
         end
       end
     end

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

@@ -46,17 +46,17 @@ module Faalis
         def fields
           fields = []
           if have_fields?
-          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)
-            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)
+              end
 
-            fields << [name, type]
+              fields << [name, type]
             end
           end
           fields
@@ -109,10 +109,20 @@ module Faalis
           result
         end
 
+        def raw_fields_data
+          if have_fields?
+            return resource_data["fields"]
+          end
+          []
+        end
+
         def fields_with(attr, value)
-          fields.select do |f|
+          raw_fields_data.select do |f|
+
             if f.include? attr
+
               if f[attr] == value
+
                 true
               else
                 false
@@ -125,11 +135,11 @@ module Faalis
         end
 
         def no_filter?
-          resource_data.include? "no_filter" &&  resource_data["no_filter"]
+          resource_data.include?("no_filter") &&  resource_data["no_filter"]
         end
 
         def have_fields?
-          unless resource_data.include? "fields"
+          if resource_data.include? "fields"
             unless resource_data["fields"].nil?
               return true
             end

data/lib/faalis/generators/dashboard_scaffold.rb

@@ -17,6 +17,7 @@ module Faalis
       include Faalis::Generators::Concerns::Angular
       include Faalis::Generators::Concerns::Tabs
       include Faalis::Generators::Concerns::Model
+      include Faalis::Generators::Concerns::AllowQueryOn
 
 
       # Do not install specs

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = "0.21.1"
+  VERSION = "0.22.0"
 end

data/lib/generators/faalis/templates/api/controller.rb.erb

@@ -1,4 +1,5 @@
 class API::V1::<%= resource.pluralize %>Controller < APIController
+  <% if allowed_fields_provided? %>allow_query_on <%= allowed_fields %><% end %>
   before_filter :build_resource, :only => :create
   <% if parent? %><% all_parents = parents %><% prev = all_parents.shift %>
   load_and_authorize_resource :<%= prev.singularize %>, :except => [:destory]

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

@@ -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="'<%= resource_data["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>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Sameer Rahmani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -477,6 +477,7 @@ files:
 - app/helpers/faalis/home_helper.rb
 - app/helpers/faalis/users_helper.rb
 - app/models/ability.rb
+- app/models/faalis/concerns/assignment.rb
 - app/models/faalis/group.rb
 - app/models/faalis/permission.rb
 - app/models/faalis/permissions/auth.rb
@@ -590,6 +591,7 @@ files:
 - lib/faalis/exceptions.rb
 - lib/faalis/generators.rb
 - lib/faalis/generators/concerns.rb
+- lib/faalis/generators/concerns/allow_query_on.rb
 - lib/faalis/generators/concerns/angular.rb
 - lib/faalis/generators/concerns/bulk.rb
 - lib/faalis/generators/concerns/dependency.rb