npo_assets 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/generators/npo_assets/npo_assets_generator.rb

@@ -1,7 +1,8 @@
 class NpoAssetsGenerator < Rails::Generator::Base
   def manifest
     record do |m|
-      m.migration_template('npo_assets.rb', 'db/migrate', :migration_file_name => 'create_assets')
+      m.migration_template('migration.rb', 'db/migrate', :migration_file_name => 'create_assets')
+      m.file('initializer.rb', 'config/initializers/npo_assets.rb')
     end
   end
 end

data/generators/npo_assets/templates/initializer.rb

@@ -0,0 +1,2 @@
+NPO::Assets.base_url     = 'http://media.omroep.nl'
+NPO::Assets.account_name = ''

data/lib/npo_assets/asset.rb

@@ -11,7 +11,7 @@ module NPO
       
       class << self
         def list(account_name=nil, options={})
-          url  = "#{ NPO::Assets::BASE_URL }.xml#{ extract_list_options(options) }"
+          url  = "#{ NPO::Assets.base_url }.xml#{ extract_list_options(options) }"
           res  = get(url, :headers => headers(account_name))
 
           if res && res['assets']
@@ -24,7 +24,7 @@ module NPO
         end
 
         def headers(account_name=nil)
-          {'X-Account' => account_name || NPO::Assets::ACCOUNT_NAME}
+          {'X-Account' => account_name || NPO::Assets.account_name}
         end
 
         private
@@ -37,7 +37,7 @@ module NPO
       end
       
       def url(size='')
-        File.join(NPO::Assets::BASE_URL, size, attributes['url'])
+        File.join(NPO::Assets.base_url, size, attributes['url'])
       end
       
       private
@@ -46,7 +46,7 @@ module NPO
           # run due to saving an imported asset
           return true if self.remote_id && new_record?
           
-          url = [NPO::Assets::BASE_URL]
+          url = [NPO::Assets.base_url]
           url << self.remote_id unless new_record?
       
           response = self.class.send(new_record? ? :post : :put, 
@@ -63,7 +63,7 @@ module NPO
         end
         
         def delete_from_media_server
-          HTTParty.delete("#{NPO::Assets::BASE_URL}/#{self.remote_id}", :headers => self.class.headers)
+          HTTParty.delete("#{NPO::Assets.base_url}/#{self.remote_id}", :headers => self.class.headers)
         end
     end
   end

data/lib/npo_assets.rb

@@ -3,7 +3,6 @@ require 'npo_assets/asset'
 
 module NPO
   module Assets
-    BASE_URL     = 'http://media.omroep.nl/assets'
-    ACCOUNT_NAME = "omroep_nl"
+    mattr_accessor :base_url, :account_name
   end
 end

data/npo_assets.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{npo_assets}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bart Zonneveld"]
@@ -24,7 +24,8 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "generators/npo_assets/npo_assets_generator.rb",
-     "generators/npo_assets/templates/npo_assets.rb",
+     "generators/npo_assets/templates/initializer.rb",
+     "generators/npo_assets/templates/migration.rb",
      "lib/npo_assets.rb",
      "lib/npo_assets/asset.rb",
      "npo_assets.gemspec",

data/spec/npo_assets/asset_spec.rb

@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe NPO::Assets::Asset do
   before(:all) do
     setup_db
+    NPO::Assets.base_url = 'http://test.com/assets'
+    NPO::Assets.account_name = 'account'
   end
   
   after(:all) do
@@ -23,9 +25,9 @@ describe NPO::Assets::Asset do
       end
     
       it "should send the correct vars" do
-        NPO::Assets::Asset.should_receive(:post).with("http://media.omroep.nl/assets", 
+        NPO::Assets::Asset.should_receive(:post).with("http://test.com/assets", 
                                                       :query => {:asset => {:file => "file"}},
-                                                      :headers => {'X-Account' => 'omroep_nl'})
+                                                      :headers => {'X-Account' => 'account'})
         do_create
       end
     
@@ -92,9 +94,9 @@ describe NPO::Assets::Asset do
       end
 
       it "should send the correct vars" do
-        NPO::Assets::Asset.should_receive(:put).with("http://media.omroep.nl/assets/2", 
+        NPO::Assets::Asset.should_receive(:put).with("http://test.com/assets/2", 
                                                      :query => {:asset => {:file => "new_file"}},
-                                                     :headers => {'X-Account' => 'omroep_nl'})
+                                                     :headers => {'X-Account' => 'account'})
         do_update
       end
       
@@ -146,7 +148,7 @@ describe NPO::Assets::Asset do
       end
       
       it "should send the correct vars" do
-        HTTParty.should_receive(:delete).with("http://media.omroep.nl/assets/2", :headers => {'X-Account' => 'omroep_nl'})
+        HTTParty.should_receive(:delete).with("http://test.com/assets/2", :headers => {'X-Account' => 'account'})
         @asset.destroy
       end
     end
@@ -162,11 +164,11 @@ describe NPO::Assets::Asset do
     end
 
     it "should return the correct url without a size" do
-      @asset.url.should == "http://media.omroep.nl/assets/1.jpg"
+      @asset.url.should == "http://test.com/assets/1.jpg"
     end
     
     it "should return the correct url with a size" do
-      @asset.url('100x200').should == "http://media.omroep.nl/assets/100x200/1.jpg"
+      @asset.url('100x200').should == "http://test.com/assets/100x200/1.jpg"
     end
   end
   
@@ -185,28 +187,28 @@ describe NPO::Assets::Asset do
       end
     
       it "should call the correct url with an explicit account name" do
-        should_get('http://media.omroep.nl/assets.xml', :headers => {'X-Account' => 'foo'})
+        should_get('http://test.com/assets.xml', :headers => {'X-Account' => 'foo'})
         do_list('foo')
       end
 
       it "should call the correct url without an explicit account name" do
-        should_get('http://media.omroep.nl/assets.xml', :headers => {'X-Account' => 'omroep_nl'})
+        should_get('http://test.com/assets.xml', :headers => {'X-Account' => 'account'})
         NPO::Assets::Asset.list
       end
     
       describe "with options" do
         it "should use :per_page" do
-          should_get('http://media.omroep.nl/assets.xml?per_page=10', :headers => {'X-Account' => 'foo'})
+          should_get('http://test.com/assets.xml?per_page=10', :headers => {'X-Account' => 'foo'})
           do_list('foo', :per_page => 10)
         end
       
         it "should use :page" do
-          should_get('http://media.omroep.nl/assets.xml?page=2', :headers => {'X-Account' => 'foo'})
+          should_get('http://test.com/assets.xml?page=2', :headers => {'X-Account' => 'foo'})
           do_list('foo', :page => 2)
         end
       
         it "should use :page and :per_page" do
-          should_get('http://media.omroep.nl/assets.xml?page=2&per_page=10', :headers => {'X-Account' => 'foo'})
+          should_get('http://test.com/assets.xml?page=2&per_page=10', :headers => {'X-Account' => 'foo'})
           do_list('foo', :page => 2, :per_page => 10)
         end
       end

data/spec/npo_assets_spec.rb

@@ -1,11 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe NPO::Assets do
-  it "should set the correct BASE_URL" do
-    NPO::Assets::BASE_URL.should == 'http://media.omroep.nl/assets'
-  end
-  
-  it "should set an empty account name" do
-    NPO::Assets::ACCOUNT_NAME.should == "omroep_nl"
-  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Bart Zonneveld
@@ -48,7 +48,8 @@ files:
 - Rakefile
 - VERSION
 - generators/npo_assets/npo_assets_generator.rb
-- generators/npo_assets/templates/npo_assets.rb
+- generators/npo_assets/templates/initializer.rb
+- generators/npo_assets/templates/migration.rb
 - lib/npo_assets.rb
 - lib/npo_assets/asset.rb
 - npo_assets.gemspec