activerecord-database-views 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmUzNjA2OTc4NGVmMDg3MmQwMDQ5YWYzOGFiZGJlZjRiYjcwNzRhMg==
-  data.tar.gz: !binary |-
-    ZmJmMDk3MGZhZWFkYjAzYzdlNzlmNDkxMzU1OWY4ODU5MjEyMmI0Yg==
+SHA1:
+  metadata.gz: 20125a212af919fae61754272c75f0d8c2f6945a
+  data.tar.gz: 81f76e8d0427e125550582b191bd0fea685486fd
 SHA512:
-  metadata.gz: !binary |-
-    YTAxZDQ0ZjUwYmIxYmM0MDJlOTI3NTliYzY3YTg3NzEyZjQwZjMwZWZjNGFj
-    NDllZWEyYzhiYmFhNmE4NmUzMWU3ZmY1OTZmYmM5YmRhYjY4YWU2ZTZjZmQ1
-    ODM4ZjA1OTJmOWQwYWMxNDIyNzFlZGYzNThiM2Y3NmY2NDBhOTc=
-  data.tar.gz: !binary |-
-    YWJmMmJiZDA1ZDcwY2E5ZGRlYmU2MjBkZWVmMmMzZjRiZDE5MTdjNmY5NTky
-    ZmIyYWFlYjRmMzExOWU2YTU4MTFlYmEwMGRiMzliZjg2ZTc3ZmFlMzBjODMy
-    MmUzMjAwMjg2NTBlOTg1ZmE2YmNkN2I3NzNiNGY1YmRjNzI4ZDY=
+  metadata.gz: a080fe9228c20000f9ac692e41ed9929cc5e732942ddcc9874e64e43703160d2cd6f45a010d5be476365bef79192b58b98eb0aa9bebb308e8ef4029d2f106153
+  data.tar.gz: dc8ffdb4429c0752eecfa417b9e1631e0b46dca6c9cd1460b6d332fa0f8aeb09509e444aefa883ab290ff325aa7931c1afb2bf705bde63e7483f6cd0326d7235

data/lib/activerecord-database-views/version.rb

@@ -1,7 +1,7 @@
 module Activerecord
   module Database
     module Views
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

data/lib/activerecord-database-views/view.rb

@@ -1,5 +1,7 @@
 module ActiveRecord::DatabaseViews
   class View
+    FILE_NAME_MATCHER_WITH_PREFIX = /^\d+?_(.+)/
+
     attr_reader :path
 
     def initialize(path)
@@ -15,11 +17,19 @@ module ActiveRecord::DatabaseViews
     end
 
     def name
-      File.basename(path, '.sql')
+      if basename =~ FILE_NAME_MATCHER_WITH_PREFIX
+        FILE_NAME_MATCHER_WITH_PREFIX.match(basename)[1]
+      else
+        basename
+      end
     end
 
     private
 
+    def basename
+      @basename ||= File.basename(path, '.sql')
+    end
+
     def full_path
       Rails.root.join(path)
     end

data/lib/activerecord-database-views/view_collection.rb

@@ -6,22 +6,18 @@ module ActiveRecord::DatabaseViews
 
     attr_reader :views
 
+    delegate :each, to: :views
+
     def initialize
       @views = view_paths.map { |path| View.new(path) }
     end
 
     def drop!
-      views.each(&:drop!)
-    end
-
-    def each
-      views.each { |view| yield view }
+      each(&:drop!)
     end
 
     def load!
-      while views.present?
-        load_view(views.first)
-      end
+      load_view(first) while first
     end
 
     private
@@ -29,10 +25,9 @@ module ActiveRecord::DatabaseViews
     def load_view(view)
       begin
         view.load! and views.delete(view)
-      rescue ActiveRecord::StatementInvalid => exc
-        if (related_view = retrieve_related_view(exc))
-          load_view(related_view)
-          retry
+      rescue ActiveRecord::StatementInvalid => exception
+        if (related_view = retrieve_related_view(exception))
+          load_view(related_view) and retry
         else
           raise exc
         end
@@ -46,7 +41,7 @@ module ActiveRecord::DatabaseViews
     end
 
     def view_paths
-      Dir.glob("db/views/**/*.sql")
+      Dir.glob('db/views/**/*.sql').sort
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-database-views
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - stevo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies: []
 description: Facilitates storing and reloading of DB views within Rails applications
 email:
@@ -30,17 +30,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ! '[none]'
-rubygems_version: 2.1.10
+rubyforge_project: "[none]"
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Facilitates reloading of DB views