spectifly-sequel 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spectifly-sequel (0.0.2)
+    spectifly-sequel (0.0.3)
       activesupport
       sequel
       spectifly
@@ -12,19 +12,12 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    builder (3.2.0)
-    columnize (0.3.6)
-    debugger (1.5.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.0)
+    builder (3.2.2)
     diff-lcs (1.2.4)
     i18n (0.6.1)
     json (1.8.0)
     multi_json (1.7.2)
-    rake (10.0.4)
+    rake (10.1.0)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -33,12 +26,12 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    sequel (3.47.0)
+    sequel (4.0.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    spectifly (0.0.1)
+    spectifly (0.0.2)
       builder
       json
       rake
@@ -48,7 +41,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.3)
-  debugger
   rake
   rspec
   simplecov

data/README.md

@@ -84,10 +84,8 @@ Spectifly::Sequel.configure {
 
 The YAML configuration file should look something like this:
 ```yaml
-Sequel:
-  Spectifly:
-    migration_path: PATH_TO_MIGRATION_DIRECTORY
-    entity_definition_path: PATH_TO_ENTITY_DEFINITION_DIRECTORY
+sequel_migration_path: PATH_TO_MIGRATION_DIRECTORY
+entity_path: PATH_TO_ENTITY_DEFINITION_DIRECTORY
 ```
 
 ## Contributing

data/Rakefile

@@ -10,4 +10,3 @@ require 'sequel'
 require 'spectifly'
 require 'spectifly/base'
 require 'spectifly/sequel'
-require 'spectifly/sequel/tasks'

data/lib/spectifly/sequel.rb

@@ -1,9 +1,8 @@
 require 'active_support/inflector/methods'
 require 'spectifly'
-require_relative 'sequel/config'
+require_relative 'sequel/configuration'
 require_relative 'sequel/types'
 require_relative 'sequel/model'
-require_relative 'sequel/tasks'
 require_relative 'sequel/relationship/base'
 require_relative 'sequel/relationship/one_to_one'
 require_relative 'sequel/relationship/belongs_to'

data/lib/spectifly/sequel/configuration.rb

@@ -0,0 +1,34 @@
+module Spectifly
+  module Sequel
+    class Configuration < Spectifly::Configuration
+      VALID_CONFIG_KEYS = [:sequel_migration_path, :sequel_migration_version_type]
+
+      attr_accessor :migration_path, :migration_version_type
+
+      def initialize(config)
+        if config.is_a? String
+          config = YAML.load_file(config)
+        end
+
+        new_config = {}
+        config.each { |k, v| new_config[k.to_s] = v }
+
+        begin
+          super new_config
+          @migration_path = new_config.fetch('sequel_migration_path')
+          @migration_version_type = get_version_type new_config['sequel_migration_version_type']
+        rescue KeyError => e
+          raise "Spectify::Sequel is not configured properly. \"#{e.message.sub(/"$/, '').sub(/^.*"/, '')}\" must be set via YAML or a hash."
+        end
+      end
+
+      def get_version_type type
+        if %w(Timestamp Integer).include? type.to_s
+          type
+        else
+          'Timestamp'
+        end
+      end
+    end
+  end
+end

data/lib/spectifly/sequel/migration_generator.rb

@@ -1,10 +1,10 @@
 module Spectifly
   module Sequel
     class MigrationGenerator
-      def initialize(entity, migration_path=nil, entity_path=nil, migration_version_type=nil)
-        @migration_path = File.expand_path(migration_path || Spectifly::Sequel.migration_path)
-        @entity_definition_path = File.expand_path(entity_path || Spectifly::Sequel.entity_definition_path)
-        @migration_version_type = migration_version_type || Spectifly::Sequel.migration_version_type
+      def initialize(entity, configuration)
+        @migration_path = File.expand_path(configuration.migration_path)
+        @entity_definition_path = File.expand_path(configuration.entity_path)
+        @migration_version_type = configuration.migration_version_type
         @builder = Spectifly::Sequel::Builder.from_path(File.join(@entity_definition_path, entity + '.entity'))
       end
 

data/lib/spectifly/sequel/version.rb

@@ -1,5 +1,5 @@
 module Spectifly
   module Sequel
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/tasks/spectifly-sequel.rake

@@ -1,12 +1,15 @@
 require 'rake'
 require 'spectifly/sequel'
+require 'spectifly/tasks'
 
 namespace 'spectifly' do
   namespace 'sequel' do
     desc 'Generate migration from entity definition file'
-    task :generate, [:entity_type] do |t, args|
-      Spectifly::Sequel.configure_with File.join(Dir.pwd, 'config', 'spectifly.yml')
-      Spectifly::Sequel::MigrationGenerator.new(args[:entity_type]).run!
+    Spectifly::Task.new('generate', [:entity_type]) do |spectifly, args|
+      # need to use some sort of factory to determine what type of configuration
+      # object we need on the Spectifly::Task#configure! method
+      configuration = Spectifly::Sequel::Configuration.new File.join(Dir.pwd, 'config', 'spectifly.yml')
+      Spectifly::Sequel::MigrationGenerator.new(args[:entity_type], configuration).run!
     end
   end
 end

data/spec/fixtures/config_file.yml

@@ -1,7 +1,4 @@
-Spectifly: &default
-  entity_definition_path: ./spec/fixtures/
-  Sequel:
-    <<: *default
-    migration_path: ./spec/tmp/migrations/
-    migration_version_type: Integer
+entity_path: ./spec/fixtures/
+sequel_migration_path: ./spec/tmp/migrations/
+sequel_migration_version_type: Integer
 

data/spec/spectifly/sequel/configuration_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Spectifly::Sequel::Configuration do
+  let(:path_to_config_file) { File.join(base_fixture_path, 'config_file.yml') }
+  let(:config_hash) {
+    {
+      'sequel_migration_path' => 'foo/bar/baz.yml',
+      'entity_path' => 'blah/blah/',
+      'sequel_migration_version_type' => 'Timestamp',
+    }
+  }
+
+  it 'should allow config to be read from yaml in a path specified by the user' do
+    subject = described_class.new path_to_config_file
+    subject.migration_path.should == './spec/tmp/migrations/'
+    subject.entity_path.should == './spec/fixtures/'
+    subject.migration_version_type.should == 'Integer'
+  end
+
+  it 'should accept a config in hash format' do
+    subject = described_class.new config_hash
+    subject.migration_path.should == 'foo/bar/baz.yml'
+    subject.entity_path.should == 'blah/blah/'
+    subject.migration_version_type.should == 'Timestamp'
+  end
+
+  it 'gives reasonable, instructive error if either path is not set' do
+    lambda {
+      described_class.new(:entity_path => 'foo')
+    }.should raise_error('Spectify::Sequel is not configured properly. "sequel_migration_path" must be set via YAML or a hash.')
+
+    lambda {
+      described_class.new(:sequel_migration_path => 'bar')
+    }.should raise_error('Spectify::Sequel is not configured properly. "entity_path" must be set via YAML or a hash.')
+
+    described_class.
+      new(config_hash.merge({:sequel_migration_version_type => 'bsadfklj'})).
+      migration_version_type.should == 'Timestamp'
+  end
+
+  it 'defaults to Timestamp migration versions if not set' do
+    subject = described_class.new(config_hash.merge({:sequel_migration_version_type => nil}))
+    subject.migration_version_type.should == 'Timestamp'
+  end
+end

data/spec/spectifly/sequel/migration_generator_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 describe Spectifly::Sequel::MigrationGenerator do
+  let(:config) { Spectifly::Sequel::Configuration.new File.join(base_fixture_path, 'config_file.yml') }
+
   before :each do
-    Spectifly::Sequel.configure_with File.join(base_fixture_path, 'config_file.yml')
     cleanup_files
   end
 
@@ -17,7 +18,7 @@ describe Spectifly::Sequel::MigrationGenerator do
   end
 
   it 'reads a Spectifly entity definition file and outputs a migration that can generate a new table for that entity' do
-    generator = Spectifly::Sequel::MigrationGenerator.new('individual')
+    generator = Spectifly::Sequel::MigrationGenerator.new('individual', config)
     generator.run!
     expected_migration_path = File.join(migration_output_path, '001_create_individuals.rb')
     File.should exist(expected_migration_path)
@@ -27,7 +28,7 @@ describe Spectifly::Sequel::MigrationGenerator do
   it 'determines what the next migration version should be' do
     File.open(File.join(migration_output_path, '001_create_cookies.rb'), 'w') { |f| f.write('Hi!') }
 
-    generator = Spectifly::Sequel::MigrationGenerator.new('individual')
+    generator = Spectifly::Sequel::MigrationGenerator.new('individual', config)
     generator.run!
 
     expected_migration_path = File.join(migration_output_path, '002_create_individuals.rb')
@@ -36,7 +37,12 @@ describe Spectifly::Sequel::MigrationGenerator do
 
   it 'uses current datetime if user is assigning timestamps' do
     DateTime.stub(:now).and_return DateTime.new(2013,01,01)
-    generator = Spectifly::Sequel::MigrationGenerator.new('individual', migration_output_path, base_fixture_path, 'Timestamp')
+    configuration = Spectifly::Sequel::Configuration.new(
+      :sequel_migration_path => migration_output_path,
+      :entity_path => base_fixture_path,
+      :sequel_migration_version_type => 'Timestamp'
+    )
+    generator = Spectifly::Sequel::MigrationGenerator.new('individual', configuration)
     generator.run!
 
     expected_migration_path = File.join(migration_output_path, '20130101000000_create_individuals.rb')

data/spectifly-sequel.gemspec

@@ -25,6 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "debugger"
   spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectifly-sequel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spectifly
@@ -110,22 +110,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +145,7 @@ files:
 - Rakefile
 - lib/spectifly/sequel.rb
 - lib/spectifly/sequel/builder.rb
-- lib/spectifly/sequel/config.rb
+- lib/spectifly/sequel/configuration.rb
 - lib/spectifly/sequel/erb/create_association_tables.erb
 - lib/spectifly/sequel/erb/create_table.erb
 - lib/spectifly/sequel/erb/field/many_to_many_association.erb
@@ -193,10 +177,9 @@ files:
 - spec/fixtures/cow.entity
 - spec/fixtures/group.entity
 - spec/fixtures/individual.entity
-- spec/fixtures/invalid_config_file.yml
 - spec/spec_helper.rb
 - spec/spectifly/sequel/builder_spec.rb
-- spec/spectifly/sequel/config_spec.rb
+- spec/spectifly/sequel/configuration_spec.rb
 - spec/spectifly/sequel/field_spec.rb
 - spec/spectifly/sequel/migration_generator_spec.rb
 - spec/spectifly/sequel/model_spec.rb
@@ -218,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2662357379730941317
+      hash: -3856835324753604270
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2662357379730941317
+      hash: -3856835324753604270
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -243,10 +226,9 @@ test_files:
 - spec/fixtures/cow.entity
 - spec/fixtures/group.entity
 - spec/fixtures/individual.entity
-- spec/fixtures/invalid_config_file.yml
 - spec/spec_helper.rb
 - spec/spectifly/sequel/builder_spec.rb
-- spec/spectifly/sequel/config_spec.rb
+- spec/spectifly/sequel/configuration_spec.rb
 - spec/spectifly/sequel/field_spec.rb
 - spec/spectifly/sequel/migration_generator_spec.rb
 - spec/spectifly/sequel/model_spec.rb

data/lib/spectifly/sequel/config.rb

@@ -1,53 +0,0 @@
-module Spectifly
-  module Sequel
-    @valid_config_keys = [:migration_path, :entity_definition_path, :migration_version_type]
-    @config = {}
-
-    def self.configure_with(path_to_config_file)
-      begin
-        config = YAML.load_file(path_to_config_file)['Spectifly']['Sequel']
-      rescue NoMethodError
-        raise config_instructions
-      end
-      configure(config)
-    end
-
-    def self.configure(opts)
-      opts.each {|k,v| @config[k.to_sym] = v if @valid_config_keys.include? k.to_sym}
-    end
-
-    def self.migration_path
-      @config[:migration_path] or raise missing_configuration('migration_path')
-    end
-
-    def self.entity_definition_path
-      @config[:entity_definition_path] or raise missing_configuration('entity_definition_path')
-    end
-
-    def self.migration_version_type
-      type = @config[:migration_version_type].to_s
-      if %w(Timestamp Integer).include? type
-        type
-      else
-        'Timestamp'
-      end
-    end
-
-private
-    def self.config_instructions 
-<<-INSTRUCTIONS
-Please format config files in the following manner:
-``- begin YAML
-Sequel:
-  Spectifly:
-    migration_path: PATH_TO_MIGRATION_DIRECTORY
-    entity_definition_path: PATH_TO_ENTITY_DEFINITION_DIRECTORY
-``- end YAML
-INSTRUCTIONS
-    end
-
-    def self.missing_configuration(config_param)
-      "Spectify::Sequel is not configured properly. \"#{config_param}\" must be set via YAML or a hash."
-    end
-  end
-end

data/spec/fixtures/invalid_config_file.yml

@@ -1,2 +0,0 @@
-entity_definition_path: ./
-migration_path: ../tmp/migrations/

data/spec/spectifly/sequel/config_spec.rb

@@ -1,60 +0,0 @@
-require 'spec_helper'
-
-describe Spectifly::Sequel do
-  let(:path_to_config_file) { File.join(base_fixture_path, 'config_file.yml') }
-  let(:path_to_invalid_config_file) { File.join(base_fixture_path, 'invalid_config_file.yml') }
-  let(:config_hash) {
-    {
-      'migration_path' => 'foo/bar/baz.yml',
-      'entity_definition_path' => 'blah/blah/',
-      'migration_version_type' => 'Timestamp',
-    }
-  }
-  let(:friendly_config_instructions) {
-<<-INSTRUCTIONS
-Please format config files in the following manner:
-``- begin YAML
-Sequel:
-  Spectifly:
-    migration_path: PATH_TO_MIGRATION_DIRECTORY
-    entity_definition_path: PATH_TO_ENTITY_DEFINITION_DIRECTORY
-``- end YAML
-INSTRUCTIONS
-  }
-
-  it 'should allow config to be read from yaml in a path specified by the user' do
-    described_class.configure_with path_to_config_file
-    described_class.migration_path.should == './spec/tmp/migrations/'
-    described_class.entity_definition_path.should == './spec/fixtures/'
-    described_class.migration_version_type.should == 'Integer'
-  end
-
-  it 'should accept a config in hash format' do
-    described_class.configure config_hash
-    described_class.migration_path.should == 'foo/bar/baz.yml'
-    described_class.entity_definition_path.should == 'blah/blah/'
-    described_class.migration_version_type.should == 'Timestamp'
-  end
-
-  it 'gives reasonable, instructive error if YAML is misconfigured' do
-    lambda {
-      described_class.configure_with path_to_invalid_config_file
-    }.should raise_error(friendly_config_instructions)
-  end
-
-  it 'gives reasonable, instructive error if either path is not set' do
-    described_class.configure({:migration_path => nil, :entity_definition_path => nil, :migration_version_type => 'IDoNotKnow'})
-    lambda {
-      described_class.migration_path
-    }.should raise_error('Spectify::Sequel is not configured properly. "migration_path" must be set via YAML or a hash.')
-    lambda {
-      described_class.entity_definition_path
-    }.should raise_error('Spectify::Sequel is not configured properly. "entity_definition_path" must be set via YAML or a hash.')
-    described_class.migration_version_type.should == 'Timestamp'
-  end
-
-  it 'defaults to Timestamp migration versions if not set' do
-    described_class.configure({:migration_version_type => nil})
-    described_class.migration_version_type.should == 'Timestamp'
-  end
-end