pixelforce_cms 2.0 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94e369f2069cd38fa8eecd04613410930fcb3f57
-  data.tar.gz: cdfd0a098e1909fd2b2f65283bc56a11cf506781
+  metadata.gz: bd2e70dd107d9131554c4e3134dcb1b7bdc6827c
+  data.tar.gz: 2fae870adf6af25ef738821f6d25c6687bfe4849
 SHA512:
-  metadata.gz: 52905a0d469cccf95820593d9c4617ec799481c7c612e307e30a10a4e006d5d605fce3d6b9954173a85735e46fc2d5a9fe27f4ce35871fcbf3b497f7eff99f0d
-  data.tar.gz: 6136a1284ad341df49261e678d1fd3175d441d4d886037069f360cd678b6945eb3f1764e61b4597efcace98535f6bed62367c4d5eea6e1370d734e66e1a7b072
+  metadata.gz: ba808c2f4cef772bb0b24f1f0e98506818a377eb8d0b7d51989fcdb56b8b7b14fbed3ce3ea9bdccfea17cbb20ae4d5e64c9d99d32af04afbe68d6e2a0f01c509
+  data.tar.gz: 01ccf3940f2e550fe716182319b9469bca6be6afb93e9dc33e9dbf7af52fb2a9f7e0b298d6e27561dea808aa571c57b75d2d47a2797bb34db754fe5f0902f29e

data/lib/generators/pixelforce_cms/install_generator.rb

@@ -57,6 +57,7 @@ module PixelforceCms
 
       def copy_model_files
         copy_file "pretty_url.rb", "app/models/concerns/pretty_url.rb"
+        copy_file "arrayable.rb", "app/models/concerns/arrayable.rb"
         copy_file "double.rb", "app/models/double.rb"
       end
 

data/lib/generators/pixelforce_cms/templates/Gemfile

@@ -51,8 +51,7 @@ gem 'au_state_select', '~> 1.1'
 #ancestry
 gem 'ancestry'
 
-group :test do
-  gem 'rspec'
+group :development, :test do
   gem 'rspec-rails', '~> 3.0'
   gem 'simplecov'
   gem "factory_girl_rails", "~> 4.0"

data/lib/generators/pixelforce_cms/templates/arrayable.rb

@@ -0,0 +1,33 @@
+module Arrayable
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def attr_arrayable(*args)
+      args.each do |arg|
+        target_class = arg.to_s.gsub('_ids', '').camelize
+        scope "by_#{arg}".gsub('_ids', '').to_sym, -> (object) do
+          case object
+          when Integer, String
+            where("? = ANY(#{self.table_name}.#{arg})", object)
+          when target_class.constantize
+            where("? = ANY(#{self.table_name}.#{arg})", object.id)
+          when Array
+            where("ARRAY[?] && #{arg}", object)
+          end 
+        end
+
+        class_eval %Q(
+          def #{arg.to_s.gsub('_ids', '').pluralize}
+            #{target_class}.where(id: #{arg})
+          end
+
+          def #{arg}=(ids)
+            ids -= [0, nil, ""]
+            super(ids)
+          end   
+        )      
+      end
+    end
+  end
+
+end

data/lib/generators/pixelforce_cms/templates/css/application/index.css.scss

@@ -28,3 +28,5 @@
 @import 'bootstrap';
 @import 'application';
 @import 'style';
+@import 'style.responsive';
+// @import 'layouts/header';

data/lib/generators/pixelforce_cms/templates/css/style.css.scss

@@ -91,6 +91,3 @@ abbr[title] { border: 0; }
 .pull-none { float: none; }
 .media > .pull-left { margin-right: $gutter*2; }
 .media > .pull-right { margin-left: $gutter*2; }
-
-@import 'style.responsive';
-@import 'layouts/*';

data/lib/pixelforce_cms/version.rb

@@ -1,3 +1,3 @@
 module PixelforceCms
-  VERSION = "2.0"
+  VERSION = "2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelforce_cms
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.2'
 platform: ruby
 authors:
 - Ben Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - lib/generators/pixelforce_cms/templates/application/_footer.html.haml
 - lib/generators/pixelforce_cms/templates/application/_head.html.haml
 - lib/generators/pixelforce_cms/templates/application/_header.html.haml
+- lib/generators/pixelforce_cms/templates/arrayable.rb
 - lib/generators/pixelforce_cms/templates/base_controller.rb
 - lib/generators/pixelforce_cms/templates/contact_us.rb
 - lib/generators/pixelforce_cms/templates/contacts_controller.rb