sufia-models 6.0.0.rc3 → 6.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51e106549a813b6bf42150ec4287e9579e171dad
-  data.tar.gz: 987fd56596a1da6b517205ddb9581b8c21fae645
+  metadata.gz: c298d5e01fec3e19368cbcf8c9dab669675fef6d
+  data.tar.gz: 5f35bbef30f86ed7c770fdc9fb2864eeb9d98ef3
 SHA512:
-  metadata.gz: c1fd765adfeacd91d0ccb197e4b9920f82d3ddf1aba32d1fabf0c403ea35eb0c6d28b3a7304e3b3850abf1a1ddec9c67b1076c764cf5e13b1388674cff138417
-  data.tar.gz: 3b399d52d64a204e6151833a0bb87bb22e61b50464767faba06e3d67084d6ddaa11acfe9abfd2047ec08b36251b372c059cabc0183fc6c7672421d292ca96943
+  metadata.gz: caa1ef71957cc6aa759a7a41d22cf99468f334aa86b0a3cce30badc6d488a6aa1eb5b2830708add33cdb5356ff8c3fe507c8771374e91da7f1ffe2c232e05442
+  data.tar.gz: 0f21473f2cb5f7ad5be47ee563ca8ee2a70ef02357121683a0f528ea1566b9ed529ad659efc5678b64f973b217647f4ff8685bef40e513b837d1b1be118a1b44

data/app/models/concerns/sufia/ability.rb

@@ -39,6 +39,7 @@ module Sufia
         can :create, TinymceAsset
         can [:create, :update], ContentBlock
       end
+      can :read, ContentBlock
     end
 
     def stats_abilities

data/lib/generators/sufia/models/install_generator.rb

@@ -10,12 +10,11 @@ This generator makes the following changes to your application:
  3. Creates the sufia.rb configuration file
  4. Generates mailboxer
  5. Generates usage stats config
- 6. Installs Blacklight gallery
- 7. Runs full-text generator
- 8. Runs proxies generator
- 9. Runs cached stats generator
-10. Runs ORCID field generator
-11. Runs user stats generator
+ 6. Runs full-text generator
+ 7. Runs proxies generator
+ 8. Runs cached stats generator
+ 9. Runs ORCID field generator
+10. Runs user stats generator
        """
   def banner
     say_status("warning", "GENERATING SUFIA MODELS", :yellow)
@@ -80,10 +79,6 @@ This generator makes the following changes to your application:
     generate 'sufia:models:usagestats'
   end
 
-  def install_blacklight_gallery
-    generate "blacklight_gallery:install"
-  end
-
   # Sets up full-text indexing (Solr config + jars)
   def full_text_indexing
     generate "sufia:models:fulltext"

data/lib/sufia/models/resque.rb

@@ -10,11 +10,19 @@ module Sufia
       end
 
       def push(job)
+        push_tries = 0
         queue = job.respond_to?(:queue_name) ? job.queue_name : default_queue_name
         begin
           ::Resque.enqueue_to queue, MarshaledJob, Base64.encode64(Marshal.dump(job))
         rescue Redis::CannotConnectError
           ActiveFedora::Base.logger.error "Redis is down!"
+        rescue Redis::TimeoutError => error
+          ActiveFedora::Base.logger.warn "Redis Timed out.  Trying again! #{job.inspect}"
+          push_tries+=1
+          # fail for good if the tries is greater than 3
+          raise error if push_tries >=3
+          sleep 0.01
+          retry
         end
       end
     end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "6.0.0.rc3"
+    VERSION = "6.0.0.rc4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc3
+  version: 6.0.0.rc4
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -458,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia