acts_as_lockable 0.2.1 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d1f65e440c52da4d26577a216441a4dc9036aad
-  data.tar.gz: 80c8df26f287cc4e8a0360326083f3cc1759965f
+  metadata.gz: 35f47df66132b6b7d6dc165a9251c53f6f8c32dd
+  data.tar.gz: f27f49e9f25301be423e085553b3354142c30645
 SHA512:
-  metadata.gz: ef5788b86d5cecd94764b2cc913dacea16065edc248dff876bac626c88bdfd1702dd735a1028b0ff64e588a167887d06a4c7e9816042d4e4f313f92b2fdca7fe
-  data.tar.gz: e894900d21564d686e9ce87e0800f74ffa7dcacf862a3b8f6a33595dbcf2cd9f7812f20ce73912c2ff343cc2a9e8042192fdd82a0e1dd94158cba7392e503abe
+  metadata.gz: d1f41f82194011e66535f40edaaa024e3661c96a15f20138541109c2409fdcbbcc8a950696bd454538539de04320adf2ac6900f0a82eff4d4f12232d7cc2d055
+  data.tar.gz: 70edf41e073598d8b7c92b2ad90b6311d4e348bd44e99a0409606bf5fddc939e5e7981bcf142b8d712dd9c1f92cb406fc062ecb7510b368369f5a02556304e8b

data/lib/acts_as_lockable.rb

@@ -1,13 +1,13 @@
 require "acts_as_lockable/version"
-require "acts_as_lockable/lock"
 require "acts_as_lockable/locker"
+require "acts_as_lockable/lockable"
 
 class ActiveRecord::Base
   def self.acts_as_lockable(options={})
 
-    has_many :locks, as: :locked
+    has_one :locker, as: :locked
     before_validation :check_locked
     
-    include ActsAsLockable::Locker
+    include ActsAsLockable::Lockable
   end
 end

data/lib/acts_as_lockable/lockable.rb

@@ -0,0 +1,21 @@
+module ActsAsLockable
+  module Lockable
+    def is_locked?
+      !self.locker.nil?
+    end
+
+    def lock
+      self.create_locker(locked_type: self.model_name.name) if self.locker.nil?
+      return true
+    end
+
+    def unlock
+      self.locker.destroy
+    end
+
+    private
+      def check_locked
+        return false if self.is_locked?
+      end
+  end
+end

data/lib/acts_as_lockable/locker.rb

@@ -1,20 +1,5 @@
-module ActsAsLockable
-  module Locker
-    def is_locked?
-      self.locks.size > 0
-    end
+class Locker < ActiveRecord::Base
 
-    def lock
-      self.locks.create
-    end
+  belongs_to :locked, polymorphic: true
 
-    def unlock
-      self.locks.clear
-    end
-
-    private
-      def check_locked
-        return false if self.is_locked?
-      end
-  end
 end

data/lib/acts_as_lockable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsLockable
-  VERSION = "0.2.1"
+  VERSION = "0.2.5"
 end

data/lib/generators/acts_as_lockable/migration/templates/active_record/migration.rb

@@ -1,9 +1,9 @@
 class ActsAsLockableMigration < ActiveRecord::Migration
   def change
-    create_table :locks do |t|
+    create_table :lockers do |t|
       t.integer :locked_id
       t.string :locked_type
     end
-    add_index :locks, :locked_id
+    add_index :lockers, :locked_id
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_lockable
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.5
 platform: ruby
 authors:
 - GIZIPP
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -99,7 +99,7 @@ files:
 - bin/console
 - bin/setup
 - lib/acts_as_lockable.rb
-- lib/acts_as_lockable/lock.rb
+- lib/acts_as_lockable/lockable.rb
 - lib/acts_as_lockable/locker.rb
 - lib/acts_as_lockable/version.rb
 - lib/generators/acts_as_lockable/migration/migration_generator.rb

data/lib/acts_as_lockable/lock.rb

@@ -1,5 +0,0 @@
-class Lock < ActiveRecord::Base
-
-  belongs_to :locked, polymorphic: true
-
-end