esp-auth 1.2.2 → 1.2.3

data/lib/esp_auth/engine.rb

@@ -162,8 +162,8 @@ module EspAuth
         def self.esp_auth_context(options={})
           default_scope order('weight')
           attr_accessible :id, :title, :ancestry, :weight, :parent
-          has_many :subcontexts, :class_name => options[:subcontext] unless options[:subcontext] == false
-          has_many :permissions, :as => :context
+          has_many :subcontexts, :class_name => options[:subcontext], :dependent => :destroy unless options[:subcontext] == false
+          has_many :permissions, :as => :context, :dependent => :destroy
           has_ancestry
 
           alias_method :absolute_depth, :depth

data/lib/esp_auth/version.rb

@@ -1,3 +1,3 @@
 module EspAuth
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/lib/tasks/sync.rake

@@ -1,17 +1,31 @@
 require 'esp-commons'
 require 'progress_bar'
+require 'timecop'
 
 desc "Syncronize blue-pages tree"
 
 namespace :esp_auth do
   task :sync => :environment do
     remotes = JSON.parse(Requester.new("#{Settings['blue-pages.url']}/categories/2.json?sync=true").response_body)
-    bar = ProgressBar.new(remotes.count)
-    remotes.each do | remote |
-      (Context.find_by_id(remote['id']) || Context.new).tap do | context |
-        context.update_attributes! remote
+    bar = ProgressBar.new(remotes.count + (Context.pluck('id') - remotes.map{|r| r['id']}).count)
+
+    Context.record_timestamps = false
+    updated_at = DateTime.now
+
+    remotes.each do |remote|
+      Timecop.freeze(updated_at) do
+        (Context.find_or_initialize_by_id(remote['id'])).tap do |context|
+          context.created_at ||= updated_at
+          context.updated_at = updated_at
+          context.update_attributes! remote
+        end
       end
       bar.increment!
     end
+
+    Context.where('updated_at <> ?', updated_at).each do |stale_context|
+      stale_context.destroy
+      bar.increment!
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-auth
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &16669340 !ruby/object:Gem::Requirement
+  requirement: &21131500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16669340
+  version_requirements: *21131500
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &16668900 !ruby/object:Gem::Requirement
+  requirement: &21131060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16668900
+  version_requirements: *21131060
 - !ruby/object:Gem::Dependency
   name: default_value_for
-  requirement: &16668460 !ruby/object:Gem::Requirement
+  requirement: &21130640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16668460
+  version_requirements: *21130640
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &16668000 !ruby/object:Gem::Requirement
+  requirement: &21130220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16668000
+  version_requirements: *21130220
 - !ruby/object:Gem::Dependency
   name: devise-russian
-  requirement: &16667560 !ruby/object:Gem::Requirement
+  requirement: &21129800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16667560
+  version_requirements: *21129800
 - !ruby/object:Gem::Dependency
   name: esp-commons
-  requirement: &16667100 !ruby/object:Gem::Requirement
+  requirement: &21129380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16667100
+  version_requirements: *21129380
 - !ruby/object:Gem::Dependency
-  name: omniauth
-  requirement: &16666660 !ruby/object:Gem::Requirement
+  name: formtastic
+  requirement: &21128960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16666660
+  version_requirements: *21128960
 - !ruby/object:Gem::Dependency
-  name: omniauth-oauth2
-  requirement: &16666220 !ruby/object:Gem::Requirement
+  name: has_enum
+  requirement: &21128540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16666220
+  version_requirements: *21128540
 - !ruby/object:Gem::Dependency
-  name: formtastic
-  requirement: &16665780 !ruby/object:Gem::Requirement
+  name: has_scope
+  requirement: &21128120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16665780
+  version_requirements: *21128120
 - !ruby/object:Gem::Dependency
-  name: has_enum
-  requirement: &16665340 !ruby/object:Gem::Requirement
+  name: has_searcher
+  requirement: &21127700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16665340
+  version_requirements: *21127700
 - !ruby/object:Gem::Dependency
-  name: has_scope
-  requirement: &16664900 !ruby/object:Gem::Requirement
+  name: inherited_resources
+  requirement: &21127280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16664900
+  version_requirements: *21127280
 - !ruby/object:Gem::Dependency
-  name: has_searcher
-  requirement: &16664460 !ruby/object:Gem::Requirement
+  name: kaminari
+  requirement: &21126860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16664460
+  version_requirements: *21126860
 - !ruby/object:Gem::Dependency
-  name: inherited_resources
-  requirement: &16664020 !ruby/object:Gem::Requirement
+  name: omniauth
+  requirement: &21126380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16664020
+  version_requirements: *21126380
 - !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: &16663600 !ruby/object:Gem::Requirement
+  name: omniauth-oauth2
+  requirement: &21125840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16663600
+  version_requirements: *21125840
 - !ruby/object:Gem::Dependency
   name: progress_bar
-  requirement: &16663160 !ruby/object:Gem::Requirement
+  requirement: &21125380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16663160
+  version_requirements: *21125380
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &16662720 !ruby/object:Gem::Requirement
+  requirement: &21124940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21124940
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &21124520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +197,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16662720
+  version_requirements: *21124520
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &16662280 !ruby/object:Gem::Requirement
+  requirement: &21124080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16662280
+  version_requirements: *21124080
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &16661860 !ruby/object:Gem::Requirement
+  requirement: &21123660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16661860
+  version_requirements: *21123660
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &16661420 !ruby/object:Gem::Requirement
+  requirement: &21123240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16661420
+  version_requirements: *21123240
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &16660980 !ruby/object:Gem::Requirement
+  requirement: &21118720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16660980
+  version_requirements: *21118720
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &16660520 !ruby/object:Gem::Requirement
+  requirement: &21118300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16660520
+  version_requirements: *21118300
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &16660080 !ruby/object:Gem::Requirement
+  requirement: &21117880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +263,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16660080
+  version_requirements: *21117880
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &16659640 !ruby/object:Gem::Requirement
+  requirement: &21117440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16659640
+  version_requirements: *21117440
 - !ruby/object:Gem::Dependency
   name: russian
-  requirement: &16659200 !ruby/object:Gem::Requirement
+  requirement: &21117020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16659200
+  version_requirements: *21117020
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &16658760 !ruby/object:Gem::Requirement
+  requirement: &21116600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +296,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16658760
+  version_requirements: *21116600
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &16658320 !ruby/object:Gem::Requirement
+  requirement: &21116180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +307,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16658320
+  version_requirements: *21116180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &16657860 !ruby/object:Gem::Requirement
+  requirement: &21115760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +318,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16657860
+  version_requirements: *21115760
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &16657420 !ruby/object:Gem::Requirement
+  requirement: &21115340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,10 +329,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16657420
+  version_requirements: *21115340
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &16656960 !ruby/object:Gem::Requirement
+  requirement: &21114920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -329,10 +340,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16656960
+  version_requirements: *21114920
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &16656520 !ruby/object:Gem::Requirement
+  requirement: &21114500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -340,7 +351,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16656520
+  version_requirements: *21114500
 description: Description of EspAuth.
 email:
 - mail@openteam.ru
@@ -411,7 +422,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2743354369963768635
+      hash: -4508669976932556479
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -420,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2743354369963768635
+      hash: -4508669976932556479
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15