deface 0.9.0 → 0.9.1

data/deface.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.authors = ["Brian D Quinn"]
   s.description = "Deface is a library that allows you to customize ERB & HAML views in a Rails application without editing the underlying view."

data/lib/deface/environment.rb

@@ -44,7 +44,7 @@ module Deface
     private
 
       def load_overrides(railtie)
-        Override.current_railtie = railtie
+        Override.current_railtie = railtie.class.to_s
         paths = railtie.respond_to?(:paths) ? railtie.paths["app/overrides"] : nil
         enumerate_and_load(paths, railtie.root)
       end

data/lib/deface/override.rb

@@ -63,7 +63,7 @@ module Deface
 
       #set loaded time (if not already present) for hash invalidation
       @args[:updated_at] ||= Time.zone.now.to_f
-      @args[:railtie] = self.class.current_railtie
+      @args[:railtie_class] = self.class.current_railtie
 
       self.class.all[virtual_key][name_key] = self
 
@@ -80,8 +80,8 @@ module Deface
       @args[:name]
     end
 
-    def railtie
-      @args[:railtie]
+    def railtie_class
+      @args[:railtie_class]
     end
 
     def sequence

data/spec/deface/environment_spec.rb

@@ -94,7 +94,8 @@ module Deface
 
       describe 'load_overrides' do
         let(:assets_path) { Pathname.new(File.join(File.dirname(__FILE__), '..', "assets")) }
-        let(:engine) { mock('railtie', :root => assets_path, :paths => {"app/overrides" => ["dummy_engine"]}) }
+        let(:engine) { mock('railtie', :root => assets_path, :class => "DummyEngine", :paths => {"app/overrides" => ["dummy_engine"]}) }
+        before { Rails.application.stub(:class => 'RailsAppl') }
 
         it "should keep a reference to which railtie/app defined the override" do
           Rails.application.stub :root => assets_path, :paths => {"app/overrides" => ["dummy_app"] }
@@ -102,7 +103,7 @@ module Deface
 
           Rails.application.config.deface.overrides.load_all(Rails.application)
 
-          Deface::Override.all.values.map(&:values).flatten.map(&:railtie).should include(Rails.application, engine)
+          Deface::Override.all.values.map(&:values).flatten.map(&:railtie_class).should include('RailsAppl', 'DummyEngine')
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deface
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70312328789300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+  version_requirements: *70312328789300
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70312328788820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+  version_requirements: *70312328788820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70312328804600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+  version_requirements: *70312328804600
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70312328803660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,12 +54,7 @@ dependencies:
         version: 3.1.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.4
+  version_requirements: *70312328803660
 description: Deface is a library that allows you to customize ERB & HAML views in
   a Rails application without editing the underlying view.
 email: brian@spreecommerce.com
@@ -147,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Deface is a library that allows you to customize ERB & HAML views in Rails