synchronisable 0.0.2 → 0.0.3

data/spec/factories/import.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :import, class: Synchronizable::Import do
+  factory :import, class: Synchronisable::Import do
     remote_id { generate :integer }
   end
 end

data/spec/models/match_spec.rb

@@ -7,12 +7,12 @@ describe Match do
         -> { Match.sync }
       end
 
-      it { should change { Match.count }.by(1) }
-      it { should change { Team.count }.by(2) }
-      it { should change { Player.count }.by(4) }
-      it { should change { MatchPlayer.count }.by(4) }
+      it { is_expected.to change { Match.count }.by(1) }
+      it { is_expected.to change { Team.count }.by(2) }
+      it { is_expected.to change { Player.count }.by(4) }
+      it { is_expected.to change { MatchPlayer.count }.by(4) }
 
-      it { should change { Synchronizable::Import.count }.by(11) }
+      it { is_expected.to change { Synchronisable::Import.count }.by(11) }
     end
 
     # TODO: Left here until :include option is implemented
@@ -30,12 +30,12 @@ describe Match do
     #     })
     #   end
 
-    #   it { should change { Match.count }.by(1) }
-    #   it { should change { Team.count }.by(2) }
-    #   it { should change { Player.count }.by(22) }
-    #   it { should change { MatchPlayer.count }.by(22) }
+    #   it { is_expected.to change { Match.count }.by(1) }
+    #   it { is_expected.to change { Team.count }.by(2) }
+    #   it { is_expected.to change { Player.count }.by(22) }
+    #   it { is_expected.to change { MatchPlayer.count }.by(22) }
 
-    #   it { should change { Synchronizable::Import.count }.by(47) }
+    #   it { is_expected.to change { Synchronisable::Import.count }.by(47) }
     # end
   end
 end

data/spec/models/team_spec.rb

@@ -28,14 +28,12 @@ describe Team do
     end
 
     context 'sync with no data specified' do
-      subject do
-        -> { Team.sync }
-      end
+      subject { -> { Team.sync } }
 
-      it { should change { Team.count }.by(2) }
-      it { should change { Player.count }.by(4) }
+      it { is_expected.to change { Team.count }.by(2) }
+      it { is_expected.to change { Player.count }.by(4) }
 
-      it { should change { Synchronizable::Import.count }.by(6) }
+      it { is_expected.to change { Synchronisable::Import.count }.by(6) }
     end
 
     context 'when remote id is not specified' do
@@ -45,19 +43,17 @@ describe Team do
     end
 
     context 'when local record does not exist' do
-      subject do
-        -> { Team.sync(remote_attrs.take(2)) }
-      end
+      subject { -> { Team.sync(remote_attrs.take(2)) } }
 
-      it { should change { Team.count }.by(2) }
-      it { should change { Synchronizable::Import.count }.by(2) }
+      it { is_expected.to change { Team.count }.by(2) }
+      it { is_expected.to change { Synchronisable::Import.count }.by(2) }
     end
 
     context 'when local and import records exists' do
       let!(:import) do
         create(:import,
           :remote_id => 'team1',
-          :synchronizable => create(:team,
+          :synchronisable => create(:team,
             :name => 'x',
             :country => 'Russia',
             :city => 'Moscow',
@@ -65,7 +61,7 @@ describe Team do
         )
       end
 
-      let!(:team) { import.synchronizable }
+      let!(:team) { import.synchronisable }
 
       subject do
         -> {
@@ -74,12 +70,12 @@ describe Team do
         }
       end
 
-      it { should change { Team.count }.by(1) }
-      it { should change { Synchronizable::Import.count }.by(1) }
+      it { is_expected.to change { Team.count }.by(1) }
+      it { is_expected.to change { Synchronisable::Import.count }.by(1) }
 
-      it { should change { team.name    }.from('x').to('y') }
-      it { should change { team.country }.from('Russia').to('USA') }
-      it { should change { team.city    }.from('Moscow').to('Washington') }
+      it { is_expected.to change { team.name    }.from('x').to('y') }
+      it { is_expected.to change { team.country }.from('Russia').to('USA') }
+      it { is_expected.to change { team.city    }.from('Moscow').to('Washington') }
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,21 +1,32 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 ENV['RAILS_ENV'] ||= 'test'
 
 require 'database_cleaner'
 require 'factory_girl'
 require 'factory_girl_sequences'
 require 'spork'
-require 'simplecov'
 
-SimpleCov.start
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
+
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+end
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-require 'synchronizable'
+require 'synchronisable'
 
 require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
+require 'rspec/its'
 
-support_pattern   = File.join(File.dirname(__FILE__), 'synchronizable', 'support', '**', '*.rb')
+support_pattern   = File.join(File.dirname(__FILE__), 'synchronisable', 'support', '**', '*.rb')
 factories_pattern = File.join(File.dirname(__FILE__), 'factories', '**', '*.rb')
 
 Dir[factories_pattern].each { |file| require file }
@@ -25,7 +36,6 @@ ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
 
 Spork.prefork do
   RSpec.configure do |config|
-    config.treat_symbols_as_metadata_keys_with_true_values = true
     config.run_all_when_everything_filtered = true
     config.filter_run focus: true
     config.order = 'random'

data/spec/{synchronizable → synchronisable}/dsl/macro_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Synchronizable::DSL::Macro do
+describe Synchronisable::DSL::Macro do
   describe 'commom attributes' do
     subject { HasMacro }
 

data/spec/synchronisable/models/import_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Synchronisable::Import do
+  let!(:team) { create :team }
+  subject     { create(:import, synchronisable: team) }
+
+  it 'destroys itself with synchronisable record' do
+    expect { subject.destroy_with_synchronisable }.to change(Team, :count).by(-1)
+  end
+end

data/spec/{synchronizable → synchronisable}/support/has_macro.rb

@@ -1,5 +1,5 @@
 class HasMacro
-  include Synchronizable::DSL::Macro
+  include Synchronisable::DSL::Macro
 
   attribute :bar, default: 1
   attribute :foo

data/spec/{synchronizable/synchronizable_spec.rb → synchronisable/synchronisable_spec.rb}

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe Synchronizable do
+describe Synchronisable do
   describe 'synchronization' do
     subject do
-      -> { Synchronizable.sync }
+      -> { Synchronisable.sync }
     end
 
     describe 'models specified in configuration' do
       context 'only Team and Match' do
         before :all do
-          Synchronizable.models = %w(Match Team)
+          Synchronisable.models = %w(Match Team)
         end
 
         it { should change { Match.count }.by(1) }
@@ -17,12 +17,12 @@ describe Synchronizable do
         it { should change { Player.count }.by(4) }
         it { should change { MatchPlayer.count }.by(4) }
 
-        it { should change { Synchronizable::Import.count }.by(11) }
+        it { should change { Synchronisable::Import.count }.by(11) }
       end
 
       context 'all' do
         before :all do
-          Synchronizable.models = %w(
+          Synchronisable.models = %w(
             Stage Tournament Team
             Match MatchPlayer Player
           )
@@ -35,25 +35,25 @@ describe Synchronizable do
         it { should change { MatchPlayer.count }.by(4) }
         it { should change { Player.count }.by(4) }
 
-        it { should change { Synchronizable::Import.count }.by(14) }
+        it { should change { Synchronisable::Import.count }.by(14) }
       end
 
       # TODO: Left here until :include option is implemented
       #
       # context 'when models setting is overriden in method call' do
       #   before :all do
-      #     Synchronizable.models = %w(Team Match)
+      #     Synchronisable.models = %w(Team Match)
       #   end
 
       #   subject do
-      #     -> { Synchronizable.sync(Match, Player) }
+      #     -> { Synchronisable.sync(Match, Player) }
       #   end
 
       #   it { should change { Match.count }.by(1) }
       #   it { should change { Player.count }.by(22) }
       #   it { should_not change { Team.count }.by(2) }
 
-      #   it { should change { Synchronizable::Import.count }.by(5) }
+      #   it { should change { Synchronisable::Import.count }.by(5) }
       # end
     end
   end

data/{synchronizable.gemspec → synchronisable.gemspec}

@@ -1,16 +1,16 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'synchronizable/version'
+require 'synchronisable/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'synchronisable'
-  spec.version       = Synchronizable::VERSION::STRING
+  spec.version       = Synchronisable::VERSION::STRING
   spec.authors       = ['Vasiliy Yorkin']
   spec.email         = ['vasiliy.yorkin@gmail.com']
   spec.description   = 'Provides base fuctionality (models, DSL) for AR synchronization with external resources (apis, services etc)'
   spec.summary       = spec.description
-  spec.homepage      = 'https://github.com/vyorkin/synchronizable'
+  spec.homepage      = 'https://github.com/vyorkin/synchronisable'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -26,7 +26,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "rails", "~> 4.0.0"
-  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "rspec-rails", "~> 3.0.0.beta2"
+  # spec.add_development_dependency "rspec-given"
+  spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "factory_girl"
   spec.add_development_dependency "factory_girl_sequences"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Vasiliy Yorkin
@@ -14,238 +14,252 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta2
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_sequences
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-spork
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides base fuctionality (models, DSL) for AR synchronization with
@@ -259,10 +273,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .rspec
+- .ruby-version
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -272,32 +287,32 @@ files:
 - bin/autospec
 - bin/rake
 - bin/rspec
-- lib/generators/synchronizable/USAGE
-- lib/generators/synchronizable/install_generator.rb
-- lib/generators/synchronizable/templates/create_imports_migration.rb
-- lib/generators/synchronizable/templates/initializer.rb
-- lib/synchronizable.rb
-- lib/synchronizable/context.rb
-- lib/synchronizable/dsl/associations.rb
-- lib/synchronizable/dsl/associations/association.rb
-- lib/synchronizable/dsl/associations/has_many.rb
-- lib/synchronizable/dsl/associations/has_one.rb
-- lib/synchronizable/dsl/macro.rb
-- lib/synchronizable/dsl/macro/attribute.rb
-- lib/synchronizable/dsl/macro/expression.rb
-- lib/synchronizable/dsl/macro/method.rb
-- lib/synchronizable/error_handler.rb
-- lib/synchronizable/exceptions.rb
-- lib/synchronizable/locale/en.yml
-- lib/synchronizable/locale/ru.yml
-- lib/synchronizable/model.rb
-- lib/synchronizable/model/methods.rb
-- lib/synchronizable/models/import.rb
-- lib/synchronizable/source.rb
-- lib/synchronizable/synchronizer.rb
-- lib/synchronizable/synchronizers/synchronizer_default.rb
-- lib/synchronizable/version.rb
-- lib/synchronizable/worker.rb
+- lib/generators/synchronisable/USAGE
+- lib/generators/synchronisable/install_generator.rb
+- lib/generators/synchronisable/templates/create_imports_migration.rb
+- lib/generators/synchronisable/templates/initializer.rb
+- lib/synchronisable.rb
+- lib/synchronisable/context.rb
+- lib/synchronisable/dsl/associations.rb
+- lib/synchronisable/dsl/associations/association.rb
+- lib/synchronisable/dsl/associations/has_many.rb
+- lib/synchronisable/dsl/associations/has_one.rb
+- lib/synchronisable/dsl/macro.rb
+- lib/synchronisable/dsl/macro/attribute.rb
+- lib/synchronisable/dsl/macro/expression.rb
+- lib/synchronisable/dsl/macro/method.rb
+- lib/synchronisable/error_handler.rb
+- lib/synchronisable/exceptions.rb
+- lib/synchronisable/locale/en.yml
+- lib/synchronisable/locale/ru.yml
+- lib/synchronisable/model.rb
+- lib/synchronisable/model/methods.rb
+- lib/synchronisable/models/import.rb
+- lib/synchronisable/source.rb
+- lib/synchronisable/synchronizer.rb
+- lib/synchronisable/synchronizers/synchronizer_default.rb
+- lib/synchronisable/version.rb
+- lib/synchronisable/worker.rb
 - spec/dummy/.gitignore
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
@@ -382,13 +397,13 @@ files:
 - spec/models/match_spec.rb
 - spec/models/team_spec.rb
 - spec/spec_helper.rb
-- spec/synchronizable/dsl/macro_spec.rb
-- spec/synchronizable/models/import_spec.rb
-- spec/synchronizable/support/has_macro.rb
-- spec/synchronizable/support/has_macro_subclass.rb
-- spec/synchronizable/synchronizable_spec.rb
-- synchronizable.gemspec
-homepage: https://github.com/vyorkin/synchronizable
+- spec/synchronisable/dsl/macro_spec.rb
+- spec/synchronisable/models/import_spec.rb
+- spec/synchronisable/support/has_macro.rb
+- spec/synchronisable/support/has_macro_subclass.rb
+- spec/synchronisable/synchronisable_spec.rb
+- synchronisable.gemspec
+homepage: https://github.com/vyorkin/synchronisable
 licenses:
 - MIT
 metadata: {}
@@ -398,12 +413,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -498,9 +513,9 @@ test_files:
 - spec/models/match_spec.rb
 - spec/models/team_spec.rb
 - spec/spec_helper.rb
-- spec/synchronizable/dsl/macro_spec.rb
-- spec/synchronizable/models/import_spec.rb
-- spec/synchronizable/support/has_macro.rb
-- spec/synchronizable/support/has_macro_subclass.rb
-- spec/synchronizable/synchronizable_spec.rb
+- spec/synchronisable/dsl/macro_spec.rb
+- spec/synchronisable/models/import_spec.rb
+- spec/synchronisable/support/has_macro.rb
+- spec/synchronisable/support/has_macro_subclass.rb
+- spec/synchronisable/synchronisable_spec.rb
 has_rdoc: