brightcontent-core 2.0.2 → 2.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brightcontent-core (2.0.2)
+    brightcontent-core (2.0.3)
       bcrypt-ruby
       bootstrap-wysihtml5-rails
       has_scope

data/lib/brightcontent/pagination.rb

@@ -5,19 +5,23 @@ module Brightcontent
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def per_page(number)
-        @per_page_count = number
+      def per_page_count
+        @per_page_count ||= 30
       end
 
-      def per_page_count
-        @per_page_count || 30
+      def per_page(number)
+        @per_page_count = number
       end
     end
 
     private
 
     def end_of_association_chain
-      super.paginate(page: params[:page], per_page: self.class.per_page_count)
+      if action_name == "index"
+        super.paginate(page: params[:page], per_page: self.class.per_page_count)
+      else
+        super
+      end
     end
 
   end

data/lib/brightcontent/routes_parser.rb

@@ -23,7 +23,7 @@ module Brightcontent
         if route && route[:action] == "index"
           route[:controller].match(/brightcontent\/(.+)/)[1]
         end
-      end.compact
+      end.compact.uniq
     end
 
     def routes_hash

data/spec/lib/brightcontent/routes_parser_spec.rb

@@ -1,8 +1,5 @@
 require "brightcontent/routes_parser"
 
-class Blog ; end
-class Article ; end
-
 module Brightcontent
   describe RoutesParser do
     let(:engine_resources) { %w{sessions admin_users} }
@@ -30,5 +27,13 @@ module Brightcontent
       it { should eq ["blogs"] }
     end
 
+    context "duplicate resources" do
+      before do
+        routes_hash << {action: "index", controller: "brightcontent/blogs" }
+      end
+
+      it { should eq ["blogs"] }
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -341,7 +341,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4292959386572265707
+      hash: -1697021567461287672
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -350,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4292959386572265707
+      hash: -1697021567461287672
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24