scopie_rails 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a6e1aa5e2a5a365a014ed63435c3b76a74d721
-  data.tar.gz: 7f2ed7653fcf3e39495abc9e307ba8a867c8c216
+  metadata.gz: 637fa6d935550c14ae68b73f8af1d4e41ec140d2
+  data.tar.gz: d198127d9506a406623f76c0c901cb6b81b5616c
 SHA512:
-  metadata.gz: 9a6ebcb123035b7e4d6b0ab03abb3a53513fbcb97011801e6a1f632f7fb3e7c3b3fc8c3a4b801feddbe1b85e1f4b109713cbb792cc6e80ed8220f33f9dab6268
-  data.tar.gz: 20b2c9b4820187515ac0564ca68d4f84246ca06484d5fee202d4bf6dc162e77cfa3a485f5ff8c35812f87694b192c8ca837c33d0cd7ecf8bf2c5e17987126568
+  metadata.gz: fe4ec28928e8c38321cec9f5a1b48bbe2fc9cbe4ae6048c95254ac410c6f0b9ab05feb473a4419a667481cb725d7c61b5061d7ad8d35182fab86ed0c91d85ee9
+  data.tar.gz: d327ebde39eb70724d32fa882f68fc57faaf06bff4a397c001830421cc76236c77765489e091fb6bb45fde0e3cc4344158a2e8af3a2c9d3a5f5066ec3f7081cf

data/lib/scopie_rails.rb

@@ -3,16 +3,15 @@
 require 'scopie'
 require 'active_support/concern'
 require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/inflections'
 
 module ScopieRails
 
-  SCOPIE_PREFIX = 'Scopies'
-  SCOPIE_SUFFIX = 'Scopie'
-  CLASS_NAME_DELIMETER = '::'
-  CONTROLLER_DELIMETER = 'Controller'
+  SCOPIE_SUFFIX = '_scopie'
 
+  if defined?(Rails)
+    require 'scopie_rails/engine'
+  end
   require 'scopie_rails/base'
   require 'scopie_rails/controller'
 

data/lib/scopie_rails/controller.rb

@@ -2,6 +2,10 @@
 module ScopieRails::Controller
   extend ActiveSupport::Concern
 
+  included do
+    class_attribute :scopie_class
+  end
+
   def default_scopie
     @default_scopie ||= find_scopie_class.new(self)
   end
@@ -14,24 +18,13 @@ module ScopieRails::Controller
     Scopie.current_scopes(hash, method: hash[:action], scopie: scopie)
   end
 
-  included do
-    class_attribute :scopie_class
-
-    def self.find_scopie_class(class_name = nil)
-      return scopie_class if scopie_class
-
-      class_name ||= name
+  def find_scopie_class
+    return self.class.scopie_class if self.class.scopie_class
 
-      ary = class_name.split(ScopieRails::CLASS_NAME_DELIMETER)
-      controller_class_name = ary.pop
-      base_class_name = controller_class_name.split(ScopieRails::CONTROLLER_DELIMETER).first
-      ary << ScopieRails::SCOPIE_PREFIX
-      ary << base_class_name + ScopieRails::SCOPIE_SUFFIX
-      scopie_class = ary.join(ScopieRails::CLASS_NAME_DELIMETER).constantize
+    scopie_name = params[:controller] + ScopieRails::SCOPIE_SUFFIX
 
-      scopie_class
-    end
+    self.class.scopie_class = scopie_name.camelize.constantize
 
-    delegate :find_scopie_class, to: :class
+    self.class.scopie_class
   end
 end

data/lib/scopie_rails/engine.rb

@@ -0,0 +1,3 @@
+class ScopieRails::Engine < ::Rails::Engine
+  config.autoload_paths += Dir["#{config.root}/app/scopies"]
+end

data/lib/scopie_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ScopieRails
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scopie_rails
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Yury Kotov
@@ -64,6 +64,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +160,7 @@ files:
 - lib/scopie_rails.rb
 - lib/scopie_rails/base.rb
 - lib/scopie_rails/controller.rb
+- lib/scopie_rails/engine.rb
 - lib/scopie_rails/version.rb
 homepage: https://github.com/beorc/scopie_rails
 licenses: