cot 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 531b8bbb2c943a86b2d9041c9b084f5dd4c9bc06
-  data.tar.gz: f0cebfb0d17cffa7a1f69584662644da4fdfce42
+  metadata.gz: 97cc9be92f280e8658df89c21a99f4696a051cf2
+  data.tar.gz: 072105df4b9c734f20e1834193a37f76fad112e9
 SHA512:
-  metadata.gz: f294e13567ac759dff0966a1fc821428d93a749c483de4bc1c0053636e0e13afb03cfd5f3f9c6d789e4e37c2994047fa5f7c8ee201e03b2da26462201cafc590
-  data.tar.gz: 2af05c7c27c7ccf7cf0cd39390f9e59c396e00511d68b415e85a25ad000565f3fddb00270dd33d92fb2e5d93e18b48fc858c42fdec917efc6ca958048f2d2be9
+  metadata.gz: 68a07d3af871d1793999cdafd4cab1ee7c1134ee78d917f85976dade39e77189f4b67d28c75090d0c14abe255f5a714984254426af2ff08dd4241bcc3f5805b9
+  data.tar.gz: a568ee0327301c1cfaf2adcb5352ffd89ff51f264f02ad2aa440c2bf8a75d13f5eca3a34625cf8032ed486d1a9955bcda27544bdd803b796df7dd83185d5fb8c

data/.rubocop.yml

@@ -0,0 +1,8 @@
+LineLength:
+  Max: 120
+
+Documentation:
+  Enabled: false
+
+MethodLength:
+  Max: 15

data/Gemfile.lock

@@ -1,44 +1,64 @@
 PATH
   remote: .
   specs:
-    cot (0.1.0)
+    cot (0.1.1)
       activemodel
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.13)
-    builder (3.1.4)
-    diff-lcs (1.2.4)
-    i18n (0.6.5)
-    minitest (4.7.5)
-    multi_json (1.7.9)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+      tzinfo (~> 1.1)
+    ast (2.0.0)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    i18n (0.6.11)
+    json (1.8.1)
+    minitest (5.4.0)
+    parser (2.2.0.pre.3)
+      ast (>= 1.1, < 3.0)
+      slop (~> 3.4, >= 3.4.5)
+    powerpack (0.0.9)
+    rainbow (2.0.0)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-its (1.0.1)
+      rspec-core (>= 2.99.0.beta1)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
+    rubocop (0.24.1)
+      json (>= 1.7.7, < 2)
+      parser (>= 2.2.0.pre.3, < 3.0)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.5.1)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.5)
-    shoulda-matchers (2.3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.6.1)
       activesupport (>= 3.0.0)
-    thread_safe (0.1.2)
-      atomic
-    tzinfo (0.3.37)
+    slop (3.5.0)
+    thread_safe (0.3.4)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -47,4 +67,6 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   cot!
   rspec
+  rspec-its
+  rubocop
   shoulda

data/Rakefile

@@ -8,6 +8,13 @@ RSpec::Core::RakeTask.new('spec') do |spec|
   spec.rspec_opts = '--tag ~broken'
 end
 
+require 'rubocop'
+if defined? RuboCop
+  desc 'run rubocop'
+  task :rubocop do
+    puts `rubocop`
+  end
+end
 
-task :default => :spec
-task :test => :spec
+task default: [:spec, :rubocop]
+task test: :spec

data/cot.gemspec

@@ -1,25 +1,26 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "cot/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'cot/version'
 
 Gem::Specification.new do |s|
   s.name = 'cot'
   s.version = Cot::VERSION
 
-  s.authors = ["Joseph Henrich"]
+  s.authors = ['Joseph Henrich']
   s.email = ['crimsonknave@gmail.com']
-  s.homepage = %q{http://github.com/crimsonknave/cot}
-  s.summary = %q{Simplifies creating models for rest based resources}
-  s.description = %q{Simplifies creating models for rest based resources}
+  s.homepage = 'http://github.com/crimsonknave/cot'
+  s.summary = 'Simplifies creating models for rest based resources'
+  s.description = 'Simplifies creating models for rest based resources'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   s.add_dependency 'activemodel'
-  s.add_development_dependency 'shoulda', ">= 0"
-  s.add_development_dependency 'bundler', ">= 1.0.0"
-  s.add_development_dependency 'rspec', ">= 0"
+  s.add_development_dependency 'shoulda', '>= 0'
+  s.add_development_dependency 'bundler', '>= 1.0.0'
+  s.add_development_dependency 'rspec', '>= 0'
+  s.add_development_dependency 'rspec-its', '>= 0'
+  s.add_development_dependency 'rubocop', '>= 0'
 end
-

data/lib/cot.rb

@@ -5,7 +5,6 @@ require 'cot/frame'
 require 'json'
 
 module Cot
-
   def version_string
     "Cot version #{Cot::VERSION}"
   end

data/lib/cot/frame.rb

@@ -5,18 +5,19 @@ module Cot
     end
     include ActiveModel::Dirty
 
-    def initialize(payload={})
+    def initialize(payload = {})
       @data = convert_keys payload
     end
 
     def exists?
-      #TODO: Have this key off a defined primary key instead of defaulting to id
+      # TODO: Have this key off a defined primary key instead of defaulting to id
       id
     end
 
     def defined_properties
       self.class.attr_methods
     end
+
     def properties_mapping
       self.class.mappings
     end
@@ -33,7 +34,7 @@ module Cot
       self.class.inverted_search_mappings ||= search_mappings.invert
     end
 
-    def self.search_property(name, args={})
+    def self.search_property(name, args = {})
       @search_mappings ||= {}
 
       key = args[:from] ? args[:from] : name
@@ -43,11 +44,11 @@ module Cot
     # TODO: Create an enum declaration that will automagically map a symbol to
     # another value (such as an int) so that the user of the library doesn't need
     # to know what number scheduled status is (for example)
-    def self.enum(name, args={})
-      raise "enum is not yet implemented"
+    def self.enum(_name, _args = {})
+      fail 'enum is not yet implemented'
     end
 
-    def self.property(name, args={})
+    def self.property(name, args = {})
       @mappings ||= {}
       @attr_methods ||= []
       @search_mappings ||= {}
@@ -82,12 +83,13 @@ module Cot
     def serializable_hash
       attrs = {}
       defined_properties.each do |m|
-        attrs[inverted_properties_mapping.fetch(m,m)] = self[m]
+        attrs[inverted_properties_mapping.fetch(m, m)] = self[m]
       end
       attrs
     end
 
     private
+
     def convert_key(key)
       key = key.to_sym
       properties_mapping.fetch(key, key).to_sym
@@ -96,11 +98,8 @@ module Cot
     def convert_keys(hash)
       return {} unless hash
       {}.tap do |ret|
-        hash.each_pair do |k,v|
-          ret[convert_key k] = v
-        end
+        hash.each_pair { |k, v| ret[convert_key k] = v }
       end
     end
-
   end
 end

data/lib/cot/rspec/matchers.rb

@@ -12,13 +12,12 @@ RSpec::Matchers.define :set_search_property do |field|
     self
   end
 end
+
 RSpec::Matchers.define :set_property do |field|
   match do |base|
     @tests = {}
     @tests[:attr_methods] = base.attr_methods.include?(field.to_sym)
-    if @from
-      @tests[:mappings] =  base.mappings[@from.to_sym] == field
-    end
+    @tests[:mappings] =  base.mappings[@from.to_sym] == field if @from
     if @searchable
       key = @from ? @from : field
       @tests[:searchable] = base.search_mappings[field] == key
@@ -34,21 +33,21 @@ RSpec::Matchers.define :set_property do |field|
     @from = from
     self
   end
+
   def searchable
     @searchable = true
     self
   end
 
   description do
-    from_string = @from ? "from #{@from}" : ""
-    search_string = @searchable ? "to be searchable" : ""
-    "should set property #{field} #{from_string} #{search_string}"
+    from_string = @from ? "from #{@from}" : ''
+    search_string = @searchable ? 'to be searchable' : ''
+    "sets property #{field} #{from_string} #{search_string}"
   end
 
-  failure_message_for_should do
-    failed = @tests.select{|k,v| !v}.keys
+  failure_message do
+    failed = @tests.keys.select { |v| !v }
     "Expected the property #{field} to be set, but the following attributes weren't set correctly #{failed}"
   end
 
 end
-

data/lib/cot/version.rb

@@ -1,3 +1,3 @@
 module Cot
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/lib/cot/frame_spec.rb

@@ -2,86 +2,88 @@ require 'spec_helper'
 describe Cot::Frame do
   before :each do
     class TestObject < Cot::Frame
-      property :foo, :from => :bar
+      property :foo, from: :bar
       property :id
-      search_property :john, :from => :crichton
+      search_property :john, from: :crichton
     end
-    @foo = TestObject.new(:bar => 'this will be foo', :id => 5)
+    @foo = TestObject.new(bar: 'this will be foo', id: 5)
   end
   subject { @foo }
   its(:to_json) { should be_kind_of String }
   its(:serializable_hash) { should be_kind_of Hash }
-  its(:serializable_hash) { should have(2).keys }
-  it 'should have more serialziable tests'
+  it 'has two keys' do
+    expect(subject.serializable_hash.size).to eq 2
+  end
+  it 'needs more serialziable tests'
   its(:id) { should eq 5 }
   its(:foo) { should eq 'this will be foo' }
 
   context 'exists?' do
-    it 'should be true if id is present' do
-      @foo.exists?.should be_true
+    it 'is true if id is present' do
+      expect(@foo.exists?).to be_truthy
     end
-    it 'should be false if id is not present' do
-      foo = TestObject.new(:foo => 5)
-      foo.exists?.should be_false
+    it 'is false if id is not present' do
+      foo = TestObject.new(foo: 5)
+      expect(foo.exists?).to be_falsey
     end
   end
   context 'defined_properties' do
-    it 'should include foo' do
-      @foo.defined_properties.should include :foo
+    it 'includes foo' do
+      expect(@foo.defined_properties).to include :foo
     end
-    it 'should be an array' do
-      @foo.defined_properties.should be_kind_of Array
+    it 'is an array' do
+      expect(@foo.defined_properties).to be_kind_of Array
     end
   end
   context 'properties_mapping' do
-    it 'should have bar => foo' do
-      @foo.properties_mapping.should have_key :bar
-      @foo.properties_mapping[:bar].should eq :foo
+    it 'has bar => foo' do
+      expect(@foo.properties_mapping).to have_key :bar
+      expect(@foo.properties_mapping[:bar]).to eq :foo
     end
   end
   context 'inverted_properties_mapping' do
-    it 'should have foo => bar' do
-      @foo.inverted_properties_mapping.should have_key :foo
-      @foo.inverted_properties_mapping[:foo].should eq :bar
+    it 'has foo => bar' do
+      expect(@foo.inverted_properties_mapping).to have_key :foo
+      expect(@foo.inverted_properties_mapping[:foo]).to eq :bar
     end
   end
   context 'search_mappings' do
-    it 'should have john => crichton' do
-      @foo.search_mappings.should have_key :john
-      @foo.search_mappings[:john].should eq :crichton
+    it 'has john => crichton' do
+      expect(@foo.search_mappings).to have_key :john
+      expect(@foo.search_mappings[:john]).to eq :crichton
     end
   end
   context 'inverted_search_mappings' do
-    it 'should have crichton => john' do
-      @foo.inverted_search_mappings.should have_key :crichton
-      @foo.inverted_search_mappings[:crichton].should eq :john
+    it 'has crichton => john' do
+      expect(@foo.inverted_search_mappings).to have_key :crichton
+      expect(@foo.inverted_search_mappings[:crichton]).to eq :john
     end
   end
   context 'search_property' do
-    it 'should add to search_mappings' do
-      TestObject.search_mappings.should have_key :john
-      TestObject.search_mappings[:john].should be :crichton
+    it 'adds to search_mappings' do
+      expect(TestObject.search_mappings).to have_key :john
+      expect(TestObject.search_mappings[:john]).to be :crichton
     end
   end
   context 'property' do
-    it 'should add to mappings' do
-      TestObject.mappings.should have_key :bar
-      TestObject.mappings[:bar].should be :foo
+    it 'adds to mappings' do
+      expect(TestObject.mappings).to have_key :bar
+      expect(TestObject.mappings[:bar]).to be :foo
     end
-    it 'should create accessor methods' do
+    it 'creates accessor methods' do
       foo = TestObject.new
-      foo.should respond_to :foo
-      foo.should respond_to :foo=
+      expect(foo).to respond_to :foo
+      expect(foo).to respond_to :foo=
     end
 
-    it 'should add to attr_methods' do
-      TestObject.attr_methods.should include(:foo)
+    it 'adds to attr_methods' do
+      expect(TestObject.attr_methods).to include(:foo)
     end
 
-    it 'accessor methods should use []' do
+    it 'accessor methods uses []' do
       foo = TestObject.new
-      foo.should_receive('[]').once.and_return 'this is foo'
-      foo.foo.should eq 'this is foo'
+      expect(foo).to receive('[]').once.and_return 'this is foo'
+      expect(foo.foo).to eq 'this is foo'
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,8 +2,9 @@ ENV['RAILS_ENV'] ||= 'test'
 
 require 'cot'
 require 'rspec'
+require 'rspec/its'
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
   config.formatter = 'documentation'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joseph Henrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -66,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !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: rubocop
+  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: Simplifies creating models for rest based resources
 email:
 - crimsonknave@gmail.com
@@ -74,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - .ruby-gemset
 - .ruby-version
 - Gemfile