appsent 0.0.3 → 0.0.4

data/spec/{internal_api → old_api/internal_api}/config_value_spec.rb

@@ -17,10 +17,12 @@ describe AppSent::ConfigValue do
   let(:params) do
     [
       @params['name'],
-      @params['type'],
       @params['value'],
-      @params['desc'],
-      @params['example']
+      {
+      :type => @params['type'],
+      :desc =>  @params['desc'],
+      :example => @params['example']
+    }
     ]
   end
 
@@ -31,7 +33,8 @@ describe AppSent::ConfigValue do
     end
 
     it "should raise exception if unsupported type passed" do
-      expect { subject.new('parameter','asd','data',nil,nil) }.to raise_exception(/data type should be ruby class!/)
+      @params['type'] = 'asd'
+      expect { subject.new(*params) }.to raise_exception(/data type should be ruby class!/)
     end
 
     context "with &block given" do
@@ -64,11 +67,14 @@ describe AppSent::ConfigValue do
     context "should return false" do
 
       it "if entry does not presence in config file" do
-	subject.new('paramname',String,nil,nil,nil).should_not be_valid
+        @params['value']=nil
+	subject.new(*params).should_not be_valid
       end
 
       it "if data in config file has wrong type" do
-	subject.new('paramname',String,2,nil,nil).should_not be_valid
+        @params['type']=Array
+        @params['value']='string'
+	subject.new(*params).should_not be_valid
       end
 
       it "if child value is not valid" do
@@ -80,7 +86,7 @@ describe AppSent::ConfigValue do
 	subject.new(*params,&values_block).should_not be_valid
       end
 
-      context "with type => Array" do
+      context "with type => Array", :wip => true do
 
 	it "if actual data is not array" do
 	  @params['type']=Array
@@ -117,7 +123,7 @@ describe AppSent::ConfigValue do
 	subject.new(*params,&values_block).should be_valid
       end
 
-      context "with type => Array" do
+      context "with type => Array", :wip => true do
 
 	it "if actual data is an array of right hashes" do
 	  @params['type']=Array
@@ -140,42 +146,84 @@ describe AppSent::ConfigValue do
 
   context "#error_message" do
 
+    subject { described_class.new(*params) }
+
     context "should generate correct error message when no data" do
 
       it "with full description" do
-	subject.new('database',String,nil,'Database name','localhost').error_message.should eq("  database: localhost # does not exists(Database name), String")
+        @params['name'] = 'database'
+        @params['value'] = nil
+        @params['type'] = String
+        @params['desc'] = 'Database name'
+        @params['example'] = 'localhost'
+        subject.error_message.should eq("  database: localhost # does not exists(Database name), String")
       end
 
       it "without example value" do
-	subject.new('database',String,nil,'Database name',nil).error_message.should eq("  database:  # does not exists(Database name), String")
+        @params['name'] = 'database'
+        @params['value'] = nil
+        @params['type'] = String
+        @params['desc'] = 'Database name'
+        @params.delete('example')
+        subject.error_message.should eq("  database:  # does not exists(Database name), String")
       end
 
       it "without description" do
-	subject.new('database',String,nil,nil,'localhost').error_message.should eq("  database: localhost # does not exists, String")
+        @params['name'] = 'database'
+        @params['value'] = nil
+        @params['type'] = String
+        @params.delete('desc')
+        @params['example'] = 'localhost'
+        subject.error_message.should eq("  database: localhost # does not exists, String")
       end
 
       it "without example and description" do
-	subject.new('database',String,nil,nil,nil).error_message.should eq("  database:  # does not exists, String")
+        @params['name'] = 'database'
+        @params['value'] = nil
+        @params['type'] = String
+        @params.delete('desc')
+        @params.delete('example')
+        subject.error_message.should eq("  database:  # does not exists, String")
       end
 
     end
 
-    context "should generate correct error message when no data is of wrong type" do
+    context "should generate correct error message when data is of wrong type" do
 
       it "with full description" do
-	subject.new('database',String,20,'Database name','localhost').error_message.should eq("  database: 20 # wrong type,should be String(Database name)")
+        @params['name'] = 'database'
+        @params['value'] = 20
+        @params['type'] = String
+        @params['desc'] = 'Database name'
+        @params['example'] = 'localhost'
+        subject.error_message.should eq("  database: 20 # wrong type,should be String(Database name)")
       end
 
       it "without example value" do
-	subject.new('database',String,20,'Database name',nil).error_message.should eq("  database: 20 # wrong type,should be String(Database name)")
+        @params['name'] = 'database'
+        @params['value'] = 20
+        @params['type'] = String
+        @params['desc'] = 'Database name'
+        @params.delete('example')
+        subject.error_message.should eq("  database: 20 # wrong type,should be String(Database name)")
       end
 
       it "without description" do
-	subject.new('database',String,20,nil,'localhost').error_message.should eq("  database: 20 # wrong type,should be String")
+        @params['name'] = 'database'
+        @params['value'] = 20
+        @params['type'] = String
+        @params.delete('desc')
+        @params['example'] = 'localhost'
+        subject.error_message.should eq("  database: 20 # wrong type,should be String")
       end
 
       it "without example and description" do
-	subject.new('database',String,20,nil,nil).error_message.should eq("  database: 20 # wrong type,should be String")
+        @params['name'] = 'database'
+        @params['value'] = 20
+        @params['type'] = String
+        @params.delete('desc')
+        @params.delete('example')
+        subject.error_message.should eq("  database: 20 # wrong type,should be String")
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsent
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-02 00:00:00.000000000 +03:00
+date: 2011-08-05 00:00:00.000000000 +03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &71364740 !ruby/object:Gem::Requirement
+  requirement: &77859100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71364740
+  version_requirements: *77859100
 - !ruby/object:Gem::Dependency
   name: BlueCloth
-  requirement: &71363500 !ruby/object:Gem::Requirement
+  requirement: &77858080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71363500
+  version_requirements: *77858080
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &71362860 !ruby/object:Gem::Requirement
+  requirement: &77857690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71362860
+  version_requirements: *77857690
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71361930 !ruby/object:Gem::Requirement
+  requirement: &77857220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *71361930
+  version_requirements: *77857220
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &71361640 !ruby/object:Gem::Requirement
+  requirement: &77856890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71361640
+  version_requirements: *77856890
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &71361190 !ruby/object:Gem::Requirement
+  requirement: &77856560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71361190
+  version_requirements: *77856560
 description: config management solution
 email:
 - kucaahbe@ukr.net
@@ -108,12 +108,15 @@ files:
 - lib/appsent/config_value.rb
 - lib/appsent/tools.rb
 - lib/appsent/version.rb
-- spec/dsl_spec.rb
+- spec/appsent/config_file_spec.rb
+- spec/appsent/config_value_spec.rb
+- spec/appsent_spec.rb
 - spec/fixtures/database.yml
 - spec/fixtures/simple_config.yml
 - spec/fixtures/simple_config_with_just_type.yml
-- spec/internal_api/config_file_spec.rb
-- spec/internal_api/config_value_spec.rb
+- spec/old_api/dsl_spec.rb
+- spec/old_api/internal_api/config_file_spec.rb
+- spec/old_api/internal_api/config_value_spec.rb
 - spec/spec_helper.rb
 - spec/tools_spec.rb
 has_rdoc: true
@@ -131,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 299044573
+      hash: -225741935
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 299044573
+      hash: -225741935
 requirements: []
 rubyforge_project: appsent
 rubygems_version: 1.6.2

data/spec/dsl_spec.rb

@@ -1,72 +0,0 @@
-require 'spec_helper'
-
-describe "AppSent.init" do
-
-  before :each do
-    @right_params = { :path => 'fixtures', :env => 'test' }
-    @fixtures_path = File.expand_path(File.join(File.dirname(__FILE__),'fixtures'))
-  end
-
-  it "should require config path" do
-    @right_params.delete(:path)
-    expect { AppSent.init(@right_params) do; end }.to raise_exception(AppSent::ConfigPathNotSet)
-  end
-
-  it "should require environment variable" do
-    @right_params.delete(:env)
-    expect { AppSent.init(@right_params) do; end }.to raise_exception(AppSent::EnvironmentNotSet)
-  end
-
-  it "should require block" do
-    expect { AppSent.init(@right_params) }.to raise_exception(AppSent::BlockRequired)
-  end
-
-  it "should save config path to @@config_path" do
-    AppSent.init(@right_params) do; end
-    AppSent.config_path.should eq(@fixtures_path)
-  end
-
-  it "should save environment to @@environment" do
-    AppSent.init(@right_params) do; end
-    AppSent.send(:class_variable_get,:@@environment).should eq('test')
-  end
-
-  it "should save array of configs to @@configs" do
-    expect {
-      AppSent.init(@right_params) do
-	config1
-	config2
-	config3
-      end
-    }.to raise_exception(AppSent::Error)
-    AppSent.config_files.should eq(%w(config1 config2 config3))
-  end
-
-  it "should create corresponding constants with values" do
-    AppSent.init(@right_params) do
-      simple_config
-      database do
-	username :type => String
-	password :type => String
-	port     :type => Fixnum
-      end
-
-      simple_config_with_just_type :type => Array
-    end
-
-    AppSent::SIMPLE_CONFIG.should eq({:a=>1, :b=>'2'})
-    AppSent::DATABASE.should eq({:username => 'user', :password => 'pass', :port => 100500})
-    AppSent::SIMPLE_CONFIG_WITH_JUST_TYPE.should eq([1,2,3])
-  end
-
-end
-
-describe 'AppSent.new' do
-
-  subject { AppSent.new }
-
-  %w(all_valid? load! full_error_message).each do |method|
-    it { should respond_to(method) }
-  end
-
-end