liquid4-rails5 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 177ab71e3e27da7d3f8d2a18d6db9e484c73593c
-  data.tar.gz: a37feced734f5aec6a8b77b7d031ce7b96366c87
+  metadata.gz: 82899e24800c42e0d142c833ce84d9ae0012baa5
+  data.tar.gz: ab0d2c0849cfc67b5f97e5eb4d569ad4afcc731f
 SHA512:
-  metadata.gz: 989abe139b73bd634f58bf15c08da8193f7525a8802c8f6d936ff55d832054d6e05f90eae9f80107b8a14bca0c53478d561132eb2e608452fcfec60ac01b8396
-  data.tar.gz: 2dcfdabfe8f467e10734334dfe970317b29b62c5b3d53f0d0011bf8d391b6ff732361408a235e0dcabaecb9b9bfafe747a518cae65410b8f4bc5d844c7a4e827
+  metadata.gz: 817bd3f0050d0478804743da1f41309c8cd3a0f668220364dde427eb5585452316ff0e12325fb2785c1eead5ecd8233ab2cd5ad37bbe01385004f29d4e852a46
+  data.tar.gz: 4f9aa06f9577bc67250ea3175f00e44ba2161419bfc39b6f7beaea80ab65cd434c08e873daa92f2d3f70feabc2776661518f522518c04e9d64a500685568e227

data/lib/liquid-rails/drops/collection_drop.rb

@@ -1,89 +1,91 @@
-module ActiveRecord
-  class RelationDrop < ::Liquid::Drop
+module Liquid
+  module Rails
+    class CollectionDrop < ::Liquid::Drop
 
-    class << self
-      attr_accessor :_scopes
-    end
+      class << self
+        attr_accessor :_scopes
+      end
 
-    def self.inherited(base)
-      base._scopes = []
-    end
+      def self.inherited(base)
+        base._scopes = []
+      end
 
-    def self.scope(*scope_names)
-      @_scopes.concat scope_names
+      def self.scope(*scope_names)
+        @_scopes.concat scope_names
 
-      scope_names.each do |scope_name|
-        define_method(scope_name) do
-          value = instance_variable_get("@_#{scope_name}")
-          return value if value
+        scope_names.each do |scope_name|
+          define_method(scope_name) do
+            value = instance_variable_get("@_#{scope_name}")
+            return value if value
 
-          raise ::Liquid::ArgumentError, "#{objects.class.name} doesn't define scope: #{scope_name}" unless objects.respond_to?(scope_name)
-          instance_variable_set("@_#{scope_name}", self.class.new(objects.send(scope_name)))
+            raise ::Liquid::ArgumentError, "#{objects.class.name} doesn't define scope: #{scope_name}" unless objects.respond_to?(scope_name)
+            instance_variable_set("@_#{scope_name}", self.class.new(objects.send(scope_name)))
+          end
         end
       end
-    end
 
-    array_methods = Array.instance_methods - Object.instance_methods
-    delegate *array_methods, to: :dropped_collection
-    delegate :total_count, :total_pages, to: :objects
+      array_methods = Array.instance_methods - Object.instance_methods
+      delegate *array_methods, to: :dropped_collection
+      delegate :total_count, :total_pages, to: :objects
 
-    def initialize(objects, options={})
-      options.assert_valid_keys(:with, :scope)
+      def initialize(objects, options={})
+        options.assert_valid_keys(:with, :scope)
 
-      @objects         = options[:scope].nil? ? objects : objects.send(options[:scope])
-      @drop_class_name = options[:with]
-    end
+        @objects         = options[:scope].nil? ? objects : objects.send(options[:scope])
+        @drop_class_name = options[:with]
+      end
 
-    def page(number)
-      self.class.new(objects.page(number))
-    end
+      def page(number)
+        self.class.new(objects.page(number))
+      end
 
-    def per(number)
-      self.class.new(objects.per(number))
-    end
+      def per(number)
+        self.class.new(objects.per(number))
+      end
 
-    def dropped_collection
-      @dropped_collection ||= @objects.map { |item| drop_item(item) }
-    end
+      def dropped_collection
+        @dropped_collection ||= @objects.map { |item| drop_item(item) }
+      end
 
-    def kind_of?(klass)
-      dropped_collection.kind_of?(klass) || super
-    end
-    alias_method :is_a?, :kind_of?
-
-    ## :[] is invoked by parser before the actual. However, this method has the same name as array method.
-    ## Override this, so it will work for both cases.
-    ## {{ post_drop.comments[0] }}
-    ## {{ post_drop.<other_methods> }}
-    def [](method)
-      if method.is_a?(Integer)
-        dropped_collection.at(method)
-      else
-        public_send(method)
+      def kind_of?(klass)
+        dropped_collection.kind_of?(klass) || super
+      end
+      alias_method :is_a?, :kind_of?
+
+      ## :[] is invoked by parser before the actual. However, this method has the same name as array method.
+      ## Override this, so it will work for both cases.
+      ## {{ post_drop.comments[0] }}
+      ## {{ post_drop.<other_methods> }}
+      def [](method)
+        if method.is_a?(Integer)
+          dropped_collection.at(method)
+        else
+          public_send(method)
+        end
       end
-    end
 
-    ## Need to override this. I don't understand too, otherwise it will return an array of drop objects.
-    ## Need to return self so that we can do chaining.
-    def to_liquid
-      self
-    end
+      ## Need to override this. I don't understand too, otherwise it will return an array of drop objects.
+      ## Need to return self so that we can do chaining.
+      def to_liquid
+        self
+      end
 
-    def inspect
-      "#<#{self.class.name} of #{drop_class} for #{objects.inspect}>"
-    end
+      def inspect
+        "#<#{self.class.name} of #{drop_class} for #{objects.inspect}>"
+      end
 
-    protected
+      protected
 
-      attr_reader :objects
+        attr_reader :objects
 
-      def drop_class
-        @drop_class ||= @drop_class_name.is_a?(String) ? @drop_class_name.safe_constantize : @drop_class_name
-      end
+        def drop_class
+          @drop_class ||= @drop_class_name.is_a?(String) ? @drop_class_name.safe_constantize : @drop_class_name
+        end
 
-      def drop_item(item)
-        liquid_drop_class = drop_class || item.drop_class
-        liquid_drop_class.new(item)
-      end
+        def drop_item(item)
+          liquid_drop_class = drop_class || item.drop_class
+          liquid_drop_class.new(item)
+        end
+    end
   end
 end

data/lib/liquid-rails/drops/drop.rb

@@ -28,7 +28,7 @@ module Liquid
       #             Array of products maps to `Liquid::Rails::CollectionDrop`.
       def self.drop_class_for(resource)
         if resource.respond_to?(:to_ary)
-          ::ActiveRecord::RelationDrop
+          Liquid::Rails::CollectionDrop
         else
           if self == Liquid::Rails::Drop
             resource.drop_class
@@ -102,10 +102,6 @@ module Liquid
         as_json.to_json(options)
       end
 
-      def before_method(method)
-        attributes[method.to_s]
-      end
-
       def liquid_method_missing(method)
         return nil unless @context && @context.strict_variables
         raise ::Liquid::UndefinedDropMethod, <<~HEREDOC

data/lib/liquid-rails/drops/droppable.rb

@@ -14,8 +14,9 @@ module Liquid
 
       module ClassMethods
         def drop_class
-          if self.name == 'ActiveRecord::Associations::CollectionProxy'
-            ActiveRecord::RelationDrop
+          if self.name == 'ActiveRecord::Associations::CollectionProxy' ||
+             self.name == 'ActiveRecord::AssociationRelation'
+            Liquid::Rails::CollectionDrop
           else
             "#{self.name}Drop".constantize
           end

data/lib/liquid-rails/railtie.rb

@@ -11,16 +11,16 @@ module Liquid
 
       initializer 'liquid-rails.include_partial' do |app|
         template_path = ::Rails.root.join('app/views')
-        Liquid::Template.file_system = Liquid::Rails::FileSystem.new(template_path)
+        ::Liquid::Template.file_system = Liquid::Rails::FileSystem.new(template_path)
       end
 
       initializer 'liquid-rails.setup_drop' do |app|
         [:active_record, :mongoid].each do |orm|
           ActiveSupport.on_load(orm) do
             Liquid::Rails.setup_drop(self)
-            # if self.is_a? ActiveRecord::Base
+            if self == ActiveRecord::Base
               Liquid::Rails.setup_drop(ActiveRecord::Relation)
-            # end
+            end
           end
         end
       end

data/lib/liquid-rails/version.rb

@@ -1,5 +1,5 @@
 module Liquid
   module Rails
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/spec/fixtures/poro.rb

@@ -52,7 +52,7 @@ CommentDrop = Class.new(Liquid::Rails::Drop) do
 end
 
 ReProfileDrop = Class.new(Liquid::Rails::Drop)
-PostsDrop     = Class.new(ActiveRecord::RelationDrop)
+PostsDrop     = Class.new(Liquid::Rails::CollectionDrop)
 RePostDrop    = Class.new(Liquid::Rails::Drop)
 ReCommentDrop = Class.new(Liquid::Rails::Drop)
-CommentsDrop  = Class.new(ActiveRecord::RelationDrop)
+CommentsDrop  = Class.new(Liquid::Rails::CollectionDrop)

data/spec/lib/liquid-rails/drops/drop_spec.rb

@@ -16,11 +16,6 @@ module Liquid
           expect(profile_drop.name).to eq('Name 1')
           expect(profile_drop.description).to eq('Description 1')
         end
-
-        it '#before_method' do
-          expect(profile_drop.before_method(:name)).to eq(profile_drop.name)
-          expect(profile_drop.before_method(:description)).to eq(profile_drop.description)
-        end
       end
 
       context '#dropify' do
@@ -49,7 +44,7 @@ module Liquid
           it "instantitates with collection drop class" do
             array = [1, 2, 3]
 
-            expect(Liquid::Rails::Drop.dropify(array)).to be_instance_of(ActiveRecord::RelationDrop)
+            expect(Liquid::Rails::Drop.dropify(array)).to be_instance_of(Liquid::Rails::CollectionDrop)
           end
         end
       end
@@ -74,7 +69,7 @@ module Liquid
           end
 
           it '#comments returns as CollectionDrop object' do
-            expect(@post_drop.comments).to be_instance_of(ActiveRecord::RelationDrop)
+            expect(@post_drop.comments).to be_instance_of(Liquid::Rails::CollectionDrop)
           end
 
           it '#recomments returns as CommentsDrop object' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid4-rails5
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Viktor Fonic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails