asset_sync 0.1.3 → 0.1.4

data/asset_sync.gemspec

@@ -6,7 +6,7 @@ require "asset_sync/version"
 Gem::Specification.new do |s|
   s.name        = "asset_sync"
   s.version     = AssetSync::VERSION
-  s.date        = "2011-08-27"
+  s.date        = "2011-08-30"
   s.platform    = Gem::Platform::RUBY 
   s.authors     = ["Simon Hamilton", "David Rice"]
   s.email       = ["shamilton@rumblelabs.com", "me@davidjrice.co.uk"]
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "asset_sync"
 
   s.add_dependency('fog')
+  s.add_dependency('activemodel')
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "bundler"

data/lib/asset_sync.rb

@@ -1,4 +1,5 @@
 require 'fog'
+require 'active_model'
 require 'erb'
 require "asset_sync/asset_sync"
 require 'asset_sync/config'

data/lib/asset_sync/asset_sync.rb

@@ -8,7 +8,7 @@ module AssetSync
 
     def config
       @config ||= Config.new
-      raise Config::Invalid("Your configuration in (config/asset_sync.yml or config/initializers/asset_sync.rb) is missing or invalid, please refer to the documention and emend") unless @config && @config.valid?
+      raise Config::Invalid.new(@config.errors.full_messages.join(', ')) unless @config && @config.valid?
       @config
     end
 

data/lib/asset_sync/config.rb

@@ -1,5 +1,6 @@
 module AssetSync
   class Config
+    include ActiveModel::Validations
 
     class Invalid < StandardError; end
 
@@ -9,6 +10,11 @@ module AssetSync
     attr_accessor :aws_region
     attr_accessor :existing_remote_files
 
+    validates :aws_access_key,        :presence => true
+    validates :aws_access_secret,     :presence => true
+    validates :aws_bucket,            :presence => true
+    validates :existing_remote_files, :inclusion => {:in => %w(keep delete)}
+
     def initialize
       self.provider = 'AWS'
       self.aws_region = nil
@@ -57,9 +63,5 @@ module AssetSync
       return options
     end
 
-    def valid?
-      true
-    end
-
   end
 end

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/asset_sync_spec.rb

@@ -4,6 +4,8 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe AssetSync, 'with initializer' do
 
   before(:all) do
+    Rails.root = 'without_yml'
+    AssetSync.config = AssetSync::Config.new
     AssetSync.configure do |config|
       config.aws_access_key = 'aaaa'
       config.aws_access_secret = 'bbbb'
@@ -14,7 +16,7 @@ describe AssetSync, 'with initializer' do
   end
 
   it "should should keep existing remote files" do
-    AssetSync.config.keep_existing_remote_files?.should == true
+    AssetSync.config.existing_remote_files?.should == true
   end
 
   it "should configure aws_access_key" do
@@ -43,6 +45,7 @@ end
 describe AssetSync, 'from yml' do
 
   before(:all) do
+    Rails.root = 'with_yml'
     AssetSync.config = AssetSync::Config.new
   end
 
@@ -67,3 +70,16 @@ describe AssetSync, 'from yml' do
   end
 
 end
+
+describe AssetSync, 'with no configuration' do
+
+  before(:all) do
+    Rails.root = 'without_yml'
+    AssetSync.config = AssetSync::Config.new
+  end
+
+  it "should be invalid" do
+    lambda{ AssetSync.config.valid?.should == false }.should raise_error(AssetSync::Config::Invalid)
+  end
+
+end

data/spec/spec_helper.rb

@@ -14,12 +14,18 @@ require 'asset_sync'
 
 class Rails
 
+  @@path = 'without_yml'
+
   def self.env
     "test"
   end
 
+  def self.root=(path)
+    @@path = path
+  end
+
   def self.root
-    File.expand_path(File.join('spec', 'rails_app'))
+    File.expand_path(File.join('spec', @@path))
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: asset_sync
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Simon Hamilton
@@ -11,7 +11,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-27 00:00:00 Z
+date: 2011-08-30 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -25,7 +26,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -33,10 +34,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +48,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -57,6 +58,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: After you run assets:precompile your assets will be synchronised with your S3 bucket, deleting unused files and only uploading the files it needs to.
 email: 
 - shamilton@rumblelabs.com
@@ -83,8 +95,9 @@ files:
 - lib/generators/asset_sync/templates/asset_sync.rb
 - lib/generators/asset_sync/templates/asset_sync.yml
 - spec/asset_sync_spec.rb
-- spec/rails_app/config/asset_sync.yml
 - spec/spec_helper.rb
+- spec/with_yml/config/asset_sync.yml
+has_rdoc: true
 homepage: https://github.com/rumblelabs/asset_sync
 licenses: []
 
@@ -108,11 +121,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: asset_sync
-rubygems_version: 1.8.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Synchronises Assets between Rails and S3
 test_files: 
 - spec/asset_sync_spec.rb
-- spec/rails_app/config/asset_sync.yml
 - spec/spec_helper.rb
+- spec/with_yml/config/asset_sync.yml