faalis 0.16.1 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 225391cf40f5ca8cdf97e7f4d53241252e500408
-  data.tar.gz: bf3c19927049eb4279aac48e8220983ab174fd58
+  metadata.gz: d61d933dd4c3ddbee82cdea09bba326cc90cb4da
+  data.tar.gz: 199548898cd205d7144769fb3c052a6ae4f9783f
 SHA512:
-  metadata.gz: 82fcaf0417b281962fa4b7a7645d6718458629791c864e0fc61ab542ec0524f17b6b5f7d84276a8aabd5d92985f3a18fb0844cf000fcbb8e97ce5a0f6fd38914
-  data.tar.gz: 1be3c8caaad28105dee68003e34a0e0948f75b6d9757f0c8551247e58be300650bd042f034827bc692a866047eeee775d1439cfe001dff95cd3db1e3b1078219
+  metadata.gz: 2d93712db24e85593e8fd0cd909ac568eb4ae978bb2acf9265b27093c3e61e8a70f51f778624d938e7735f2552b10d25542f0a426a87073e322ca80836e8b95e
+  data.tar.gz: 9c737066654c5c2049facc4e20cedf0ab78134dbf0d3640f62b636634520e907e1bd395d72e3f2469754765f83005f85cac38ab8d1ac205abc6d381b4ffb3be5

data/app/models/faalis/user.rb

@@ -51,6 +51,14 @@ module Faalis
 
     devise *@@devise_options
 
+    def name
+      "#{first_name} #{last_name}"
+    end
+
+    def full_name
+      name
+    end
+
     def password_required?
       # TODO: nil? is not suitable for here we should use empty? or blink?
       if Devise.omniauth_configs.any?

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = "0.16.1"
+  VERSION = "0.16.3"
 end

data/lib/generators/faalis/js_scaffold_generator.rb

@@ -128,6 +128,7 @@ module Faalis
       # PRIVATES --------------------------------------------
       private
 
+      # Resource parent related ----------------------
       # check for parent
       def parent?
         if options[:parent] != ""
@@ -136,6 +137,17 @@ module Faalis
         false
       end
 
+      # Remove the starting slash from the given parent path
+      def trim_parent_path
+        if parent?
+          options[:parent].gsub(/^\//, "")
+        else
+          ""
+        end
+      end
+
+      # -------------------------
+
       # Path to the resource
       def resource_path
         path_parts = resource_name.split("/")

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

@@ -217,7 +217,8 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
 
     };
     <% unless options[:no_filter] %>/*<% end %>
-    API.all("<%= resource.pluralize.underscore %>").getList()
+    <% if parent? %>API.one("<%= trim_parent_path %>", <%= options[:parent] %>_id).all("<%= resource.pluralize.underscore %>").getList()<% else %>
+    API.all("<%= resource.pluralize.underscore %>").getList()<% end %>
         .then(function(data){
             $scope.<%= resource.pluralize.underscore %> = data;
         }, function(data){

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.3
 platform: ruby
 authors:
 - Sameer Rahmani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -241,14 +241,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -644,7 +644,6 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/config.ru
 - spec/dummy/README.rdoc
-- spec/dummy/db/test.sqlite3
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -707,7 +706,6 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/config.ru
 - spec/dummy/README.rdoc
-- spec/dummy/db/test.sqlite3
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css