activerecord-hideable 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa50948ee6a934da373be7d4919248ca2a2f568
-  data.tar.gz: a17164ee339fc197f31acf1d62958cb651e5f23a
+  metadata.gz: 473116b3e36e5ae79accdc9a613e79a9f12de258
+  data.tar.gz: 546dc7ed53c6c4d4fe7b48658f1354cff74415f0
 SHA512:
-  metadata.gz: 6ee790c277db812c7a4ee9ed16bff317ea597919a51243e4777f939be542d1a651fa95c902264212af6e56fd1bc69495f1601ebc546aa775b3d213fb97a665e8
-  data.tar.gz: 9e7bd8f87104bec0f15e7c2290f0c0d74dabf863db7ea87de1664c19654bdab99f9a256743840f60ae1cf368251f3a2aaceb4fd7aef63cd327e49a74eb6b00bd
+  metadata.gz: 30c38fb69bee9028e7b54492ff4e2223ca52f972b4587dacb8d7e21e9134ba63fe1e68772daedc84634de809fbe6c92ebd1827608bdb3805a7a4bf2f2ffad00c
+  data.tar.gz: cd75369acccab25b8964b903cdec7d120efe3981e5c63b300d9ed77d1853230c9a4fcfea48c5847e627453c8d29bf8d1fbac0a901bb7c3e52456f9a3e5edb729

data/activerecord-hideable.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name            = 'activerecord-hideable'
-  s.version         = '1.0.2'
+  s.version         = '1.0.3'
   s.authors         = ['Yaroslav Konoplov']
   s.email           = ['eahome00@gmail.com']
   s.summary         = 'Toggles for ActiveRecord models'
@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.test_files      = `git ls-files -z -- {test,spec,features}/*`.split("\x0")
   s.require_paths   = ['lib']
 
-  s.add_dependency 'activesupport',       '>= 3.0', '< 6.0'
-  s.add_dependency 'activerecord',        '>= 3.0', '< 6.0'
-  s.add_dependency 'activerecord-traits', '~> 1.0'
+  s.add_dependency 'activesupport', '>= 3.0', '< 6.0'
+  s.add_dependency 'activerecord',  '>= 3.0', '< 6.0'
 end

data/lib/activerecord-hideable.rb

@@ -3,7 +3,6 @@
 
 require 'active_support/concern'
 require 'active_record'
-require 'activerecord-traits'
 
 require 'activerecord-hideable/macro'
 require 'activerecord-hideable/migration'
@@ -14,14 +13,6 @@ begin
 rescue LoadError
 end
 
-module Hideable
-  class << self
-    attr_accessor :default_column
-  end
-
-  self.default_column = :hidden
-end
-
 class ActiveRecord::Base
   include Hideable::Macro
 end

data/lib/activerecord-hideable/essay.rb

@@ -4,7 +4,7 @@
 module Essay
   class ModelFeatures
     def hideable?
-      model_class.respond_to?(:hideable_options)
+      !!active_record.hideable?
     end
 
     serialize do
@@ -14,7 +14,7 @@ module Essay
 
   class AttributeFeatures
     def toggle?
-      model_features.hideable? && model_class.hideable_options.fetch(:toggle) == attribute_name
+      active_record.features.hideable? && attribute.name == :hidden
     end
 
     serialize do

data/lib/activerecord-hideable/macro.rb

@@ -5,27 +5,22 @@ module Hideable
   module Macro
     extend ActiveSupport::Concern
 
+    included { class_attribute :hideable }
+
     module ClassMethods
       #
       # class Article < ActiveRecord::Base
-      #   acts_as_hideable toggle: :hidden
+      #   acts_as_hideable
       # end
       #
-      def acts_as_hideable(options = {})
-        options.reverse_merge!(toggle: Hideable.default_column)
-        toggle = options[:toggle]
-
-        scope :hidden, -> { where(toggle => true)  }
-        scope :shown,  -> { where(toggle => false) }
-
-        define_method(:shown?)  {  !self[toggle] }
-        define_method(:hidden?) { !!self[toggle] } unless toggle == :hidden
+      def acts_as_hideable
+        scope :hidden, -> { where(hidden: true)  }
+        scope :shown,  -> { where(hidden: false) }
 
-        unless respond_to?(:hideable_options)
-          class_attribute :hideable_options, instance_accessor: false, instance_predicate: false
-        end
+        define_method(:shown?) { !hidden }
 
-        self.hideable_options = options
+        self.hideable = true
+        nil
       end
     end
   end

data/lib/activerecord-hideable/migration.rb

@@ -3,9 +3,8 @@
 
 module Hideable
   module Migration
-    def toggle(column_name = Hideable.default_column, **options)
-      options.reverse_merge!(null: false, default: false, index: true)
-      column(column_name, :boolean, options)
+    def toggle(options = {})
+      column :hidden, :boolean, options.reverse_merge!(null: false, default: false, index: true)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hideable
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -50,20 +50,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: activerecord-traits
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Toggles for ActiveRecord models
 email:
 - eahome00@gmail.com