tinybucket 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1269b0935055e587255a2efa9485d568d075c581
-  data.tar.gz: 142e74c98d8bcee9cdd98cb3561b68cdc7002901
+  metadata.gz: 24e3536cf6f81ae670df0d854aca916d60ab010d
+  data.tar.gz: 2d59c8468bb0a79a5a6ce76d1a7858817fbcc7f7
 SHA512:
-  metadata.gz: d6ad29db68508a71f16670550762f6461588f55397f140d3375c801da2e27569c96ac402d272aa0492f1b6fc4bbc10e046a259a3a83e8bbb06eaa93b4fd72f98
-  data.tar.gz: b77657f858c70b6a869bbfc76f4a89f97e74489d7014106741fec697aa1380f4d913e97b0cd8c6d1529000d89a56b45f559d57fd5955cfd0c0a255164918ab54
+  metadata.gz: 1217df53d313c34644437182696fcb2741813c40af241057bbab8c925491b6a3a44a7c1d9eeea534d64306ab0834b80c01de2ab649c465dd8ec85cc577c72a55
+  data.tar.gz: 6badf2bcc2aabb16604f3cea9274723c704dddee46af91050534032fdae72f31f12e127f5fde5d8225f5d43dfc1c1187cb856313ba7a66aee0ca0071a826e77e

data/lib/tinybucket/model/base.rb

@@ -2,6 +2,7 @@ module Tinybucket
   module Model
     class Base
       include ::ActiveModel::Serializers::JSON
+      include Concerns::AcceptableAttributes
       attr_accessor :api_config
 
       def self.concern_included?(concern_name)
@@ -16,21 +17,19 @@ module Tinybucket
       end
 
       def attributes=(hash)
-        hash.each { |key, value| send("#{key}=", value) }
-      end
-
-      def attributes
-        instance_values.select do |key, _value|
-          case key
-          when /\A_.+\z/
-          when 'api_config', 'repo_owner', 'repo_slug'
-            false
+        hash.each do |key, value|
+          if acceptable_attribute?(key)
+            send("#{key}=", value)
           else
-            true
+            # rubocop:disable Metrics/LineLength
+            logger.warn("Ignored '#{key}' attribute (value: #{value}). [#{self.class}]")
+            # rubocop:enable Metrics/LineLength
           end
         end
       end
 
+      alias_method :attributes, :acceptable_attributes
+
       protected
 
       def create_api(api_key, keys,  options)
@@ -49,6 +48,10 @@ module Tinybucket
       def create_instance(klass_name, options)
         ApiFactory.create_instance(klass_name, api_config, options)
       end
+
+      def logger
+        Tinybucket.logger
+      end
     end
   end
 end

data/lib/tinybucket/model/branch_restriction.rb

@@ -3,7 +3,7 @@ module Tinybucket
     class BranchRestriction < Base
       include Tinybucket::Model::Concerns::RepositoryKeys
 
-      attr_accessor :groups, :id, :kind, :links, :pattern, :users, :uuid
+      acceptable_attributes :groups, :id, :kind, :links, :pattern, :users, :uuid
 
       def update(_params)
         fail NotImplementedError

data/lib/tinybucket/model/comment.rb

@@ -4,7 +4,7 @@ module Tinybucket
       include Tinybucket::Model::Concerns::RepositoryKeys
       include Tinybucket::Model::Concerns::Reloadable
 
-      attr_accessor \
+      acceptable_attributes \
         :links, :id, :parent,  :filename, :content, :user, :inline, \
         :created_on, :updated_on, :uuid
 

data/lib/tinybucket/model/commit.rb

@@ -4,7 +4,7 @@ module Tinybucket
       include Tinybucket::Model::Concerns::RepositoryKeys
       include Tinybucket::Model::Concerns::Reloadable
 
-      attr_accessor \
+      acceptable_attributes \
         :hash, :links, :repository, :author, :parents, :date,
         :message, :participants, :uuid
 

data/lib/tinybucket/model/concerns.rb

@@ -4,6 +4,7 @@ module Tinybucket
       extend ActiveSupport::Autoload
 
       [
+        :AcceptableAttributes,
         :RepositoryKeys,
         :Reloadable
       ].each do |mod_name|

data/lib/tinybucket/model/concerns/acceptable_attributes.rb

@@ -0,0 +1,32 @@
+module Tinybucket
+  module Model
+    module Concerns
+      module AcceptableAttributes
+        extend ActiveSupport::Concern
+
+        included do
+          def self.acceptable_attributes(*attrs)
+            @_acceptable_attributes = attrs.map(&:intern)
+
+            attr_accessor(*attrs)
+          end
+
+          def self.acceptable_attribute?(key)
+            return false if @_acceptable_attributes.nil?
+            @_acceptable_attributes.include?(key.intern)
+          end
+
+          protected
+
+          def acceptable_attribute?(key)
+            self.class.acceptable_attribute?(key)
+          end
+
+          def acceptable_attributes
+            self.class.instance_variable_get(:@_acceptable_attributes) || []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tinybucket/model/error_response.rb

@@ -1,7 +1,7 @@
 module Tinybucket
   module Model
     class ErrorResponse < Base
-      attr_accessor :message, :fields, :detail, :id, :uuid
+      acceptable_attributes :message, :fields, :detail, :id, :uuid
     end
   end
 end

data/lib/tinybucket/model/profile.rb

@@ -3,7 +3,7 @@ module Tinybucket
     class Profile < Base
       include Tinybucket::Model::Concerns::Reloadable
 
-      attr_accessor \
+      acceptable_attributes \
         :username, :kind, :website, :display_name,
         :links, :created_on, :location, :type, :uuid
 

data/lib/tinybucket/model/pull_request.rb

@@ -4,7 +4,7 @@ module Tinybucket
       include Tinybucket::Model::Concerns::RepositoryKeys
       include Tinybucket::Model::Concerns::Reloadable
 
-      attr_accessor \
+      acceptable_attributes \
         :state, :description, :links, :title, :close_source_branch,
         :destination, :reason, :id, :source, :created_on, :author, :updated_on,
         :merge_commit, :closed_by, :reviewers, :participants, :uuid

data/lib/tinybucket/model/repository.rb

@@ -4,9 +4,10 @@ module Tinybucket
       include Tinybucket::Model::Concerns::RepositoryKeys
       include Tinybucket::Model::Concerns::Reloadable
 
-      attr_accessor :scm, :has_wiki, :description, :links, :updated_on,
-                    :fork_policy, :created_on, :owner, :size, :parent, :uuid,
-                    :has_issues, :is_private, :full_name, :name, :language
+      acceptable_attributes \
+        :scm, :has_wiki, :description, :links, :updated_on,
+        :fork_policy, :created_on, :owner, :size, :parent, :uuid,
+        :has_issues, :is_private, :full_name, :name, :language
 
       def create(_params)
         fail NotImplementedError

data/lib/tinybucket/model/team.rb

@@ -3,7 +3,7 @@ module Tinybucket
     class Team < Base
       include Tinybucket::Model::Concerns::Reloadable
 
-      attr_accessor \
+      acceptable_attributes \
         :username, :kind, :website, :display_name, :uuid,
         :links, :created_on, :location, :type
 

data/lib/tinybucket/version.rb

@@ -1,3 +1,3 @@
 module Tinybucket
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/fixtures/branch_restriction.json

@@ -0,0 +1,17 @@
+{
+    "groups": [],
+    "id": 52,
+    "kind": "delete",
+    "links": [
+        {
+            "href": "https://api.bitbucket.org/2.0/repositories/manthony/restrictiontest/branch-restrictions/52",
+            "rel": "self"
+        },
+        {
+            "href": "https://api.bitbucket.org/2.0/repositories/manthony/restrictiontest/branch-restrictions",
+            "rel": "parent"
+        }
+    ],
+    "pattern": "foobar/*",
+    "users": []
+}

data/spec/fixtures/comment.json

@@ -0,0 +1,30 @@
+{
+  "links": {
+    "self": {
+      "href": "https://bitbucket.org/api/2.0/repositories/tutorials/tutorials.bitbucket.org/pullrequests/2821/comments/839163"
+    },
+    "html": {
+      "href": "https://bitbucket.org/tutorials/tutorials.bitbucket.org/pull-request/2821/_/diff#comment-839163"
+    }
+  },
+  "content": {
+    "raw": "this is my first comment",
+    "markup": "markdown",
+    "html": "<p>this is my first comment</p>"
+  },
+  "created_on": "2013-11-19T21:19:24.138375+00:00",
+  "user": {
+    "username": "tutorials",
+    "display_name": "first name last",
+    "links": {
+      "self": {
+        "href": "https://bitbucket.org/api/2.0/users/tutorials"
+      },
+      "avatar": {
+        "href": "https://bitbucket-assetroot.s3.amazonaws.com/c/photos/2013/Jul/17/tutorials-avatar-1826704565-4_avatar.png"
+      }
+    }
+  },
+  "updated_on": "2013-11-19T21:19:24.141013+00:00",
+  "id": 839163
+}

data/spec/fixtures/team.json

@@ -0,0 +1,32 @@
+{
+    "username": "teamsinspace",
+    "website": null,
+    "display_name": "Teams In Space",
+    "uuid": "{61fc5cf6-d054-47d2-b4a9-061ccf858379}",
+    "links": {
+        "self": {
+            "href": "https://bitbucket.org/api/2.0/teams/teamsinspace"
+        },
+        "repositories": {
+            "href": "https://bitbucket.org/api/2.0/repositories/teamsinspace"
+        },
+        "html": {
+            "href": "https://bitbucket.org/teamsinspace"
+        },
+        "followers": {
+            "href": "https://bitbucket.org/api/2.0/teams/teamsinspace/followers"
+        },
+        "avatar": {
+            "href": "https://bitbucket-assetroot.s3.amazonaws.com/c/photos/2014/Sep/24/teamsinspace-avatar-3731530358-7_avatar.png"
+        },
+        "members": {
+            "href": "https://bitbucket.org/api/2.0/teams/teamsinspace/members"
+        },
+        "following": {
+            "href": "https://bitbucket.org/api/2.0/teams/teamsinspace/following"
+        }
+    },
+    "created_on": "2014-04-08T00:00:14.070969+00:00",
+    "location": null,
+    "type": "team"
+}

data/spec/lib/tinybucket/model/branch_restriction_spec.rb

@@ -3,12 +3,14 @@ require 'spec_helper'
 RSpec.describe Tinybucket::Model::BranchRestriction do
   include ApiResponseMacros
 
+  let(:model_json) { load_json_fixture('branch_restriction') }
+
+  let(:request_method) { :get }
+  let(:request_path) { nil }
+
   let(:owner) { 'test_owner' }
   let(:slug)  { 'test_repo' }
 
-  # TODO: fix model_json
-  let(:model_json) { nil }
-
   let(:model) do
     m = Tinybucket::Model::BranchRestriction.new(model_json)
     m.repo_owner = owner
@@ -19,6 +21,10 @@ RSpec.describe Tinybucket::Model::BranchRestriction do
 
   before { stub_apiresponse(:get, request_path, stub_options) if request_path }
 
+  it_behaves_like 'model has acceptable_attributes',
+                  Tinybucket::Model::BranchRestriction,
+                  load_json_fixture('branch_restriction')
+
   describe '#update' do
     pending 'TODO implement method'
   end

data/spec/lib/tinybucket/model/comment_spec.rb

@@ -4,6 +4,8 @@ RSpec.describe Tinybucket::Model::Comment do
   include ApiResponseMacros
   include ModelMacros
 
+  let(:model_json) { load_json_fixture('comment') }
+
   let(:owner) { 'test_owner' }
   let(:slug)  { 'test_repo' }
 
@@ -15,6 +17,10 @@ RSpec.describe Tinybucket::Model::Comment do
     m
   end
 
+  it_behaves_like 'model has acceptable_attributes',
+                  Tinybucket::Model::Comment,
+                  load_json_fixture('comment')
+
   describe 'model can reloadable' do
     let(:comment) do
       m = Tinybucket::Model::Comment.new({})

data/spec/lib/tinybucket/model/commit_spec.rb

@@ -4,12 +4,15 @@ RSpec.describe Tinybucket::Model::Commit do
   include ApiResponseMacros
   include ModelMacros
 
+  let(:model_json) { load_json_fixture('commit') }
+
+  let(:request_path) { nil }
+
   let(:owner) { 'test_owner' }
   let(:slug) { 'test_repo' }
 
   let(:model) do
-    json = JSON.load(File.read('spec/fixtures/commit.json'))
-    m = Tinybucket::Model::Commit.new(json)
+    m = Tinybucket::Model::Commit.new(model_json)
     m.repo_owner = owner
     m.repo_slug  = slug
     m.hash = '1'
@@ -17,10 +20,12 @@ RSpec.describe Tinybucket::Model::Commit do
     m
   end
 
-  let(:request_path) { nil }
-
   before { stub_apiresponse(:get, request_path) if request_path }
 
+  it_behaves_like 'model has acceptable_attributes',
+                  Tinybucket::Model::Commit,
+                  load_json_fixture('commit')
+
   describe 'model can reloadable' do
     let(:commit) do
       m = Tinybucket::Model::Commit.new({})

data/spec/lib/tinybucket/model/profile_spec.rb

@@ -4,19 +4,24 @@ RSpec.describe Tinybucket::Model::Profile do
   include ApiResponseMacros
   include ModelMacros
 
+  let(:model_json) { load_json_fixture('profile') }
+
+  let(:request_path) { nil }
+
   let(:username) { 'test_owner' }
 
-  let(:model_json) { JSON.load(File.read('spec/fixtures/profile.json')) }
   let(:model) do
     m = Tinybucket::Model::Profile.new(model_json)
     m.username = username
     m
   end
 
-  let(:request_path) { nil }
-
   before { stub_apiresponse(:get, request_path) if request_path }
 
+  it_behaves_like 'model has acceptable_attributes',
+                  Tinybucket::Model::Profile,
+                  load_json_fixture('profile')
+
   describe 'model can reloadable' do
     let(:profile) do
       m = Tinybucket::Model::Profile.new({})

data/spec/lib/tinybucket/model/pull_request_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Tinybucket::Model::PullRequest do
   include ApiResponseMacros
   include ModelMacros
 
-  let(:model_json) { JSON.load(File.read('spec/fixtures/pull_request.json')) }
+  let(:model_json) { load_json_fixture('pull_request') }
 
   let(:request_method) { :get }
   let(:request_path) { nil }
@@ -30,6 +30,10 @@ RSpec.describe Tinybucket::Model::PullRequest do
     end
   end
 
+  it_behaves_like 'model has acceptable_attributes',
+                  Tinybucket::Model::PullRequest,
+                  load_json_fixture('pull_request')
+
   describe 'model can reloadable' do
     let(:pr) do
       m = Tinybucket::Model::PullRequest.new({})

data/spec/lib/tinybucket/model/repository_spec.rb

@@ -4,10 +4,14 @@ RSpec.describe Tinybucket::Model::Repository do
   include ApiResponseMacros
   include ModelMacros
 
+  let(:model_json) { load_json_fixture('repository') }
+
+  let(:request_path) { nil }
+  let(:stub_options) { {} }
+
   let(:owner) { 'test_owner' }
   let(:slug)  { 'test_repo' }
 
-  let(:model_json) { JSON.load(File.read('spec/fixtures/repository.json')) }
   let(:model) do
     m = Tinybucket::Model::Repository.new(model_json)
     m.repo_owner = owner
@@ -15,11 +19,13 @@ RSpec.describe Tinybucket::Model::Repository do
 
     m
   end
-  let(:request_path) { nil }
-  let(:stub_options) { {} }
 
   before { stub_apiresponse(:get, request_path, stub_options) if request_path }
 
+  it_behaves_like 'model has acceptable_attributes',
+                  Tinybucket::Model::Repository,
+                  load_json_fixture('repository')
+
   describe 'model can reloadable' do
     let(:repo) do
       m = Tinybucket::Model::Repository.new({})

data/spec/lib/tinybucket/model/team_spec.rb

@@ -4,19 +4,24 @@ RSpec.describe Tinybucket::Model::Team do
   include ApiResponseMacros
   include ModelMacros
 
+  let(:model_json) { load_json_fixture('team') }
+
+  let(:request_path) { nil }
+
   let(:teamname) { 'test_team' }
 
-  let(:model_json) { JSON.load(File.read('spec/fixtures/profile.json')) }
   let(:model) do
     m = Tinybucket::Model::Team.new(model_json)
     m.username = teamname
     m
   end
 
-  let(:request_path) { nil }
-
   before { stub_apiresponse(:get, request_path) if request_path }
 
+  it_behaves_like 'model has acceptable_attributes',
+                  Tinybucket::Model::Team,
+                  load_json_fixture('team')
+
   describe 'model can reloadable' do
     let(:team) do
       m = Tinybucket::Model::Team.new({})

data/spec/spec_helper.rb

@@ -38,5 +38,7 @@ logger.level = Logger::DEBUG
 Tinybucket.logger = logger
 
 RSpec.configure do |config|
+  config.extend FixtureMacros
+  config.include FixtureMacros
   config.order = 'random'
 end

data/spec/support/fixture_macros.rb

@@ -0,0 +1,5 @@
+module FixtureMacros
+  def load_json_fixture(suffix)
+    JSON.load(File.read('spec/fixtures/' + suffix + '.json'))
+  end
+end

data/spec/support/model_macros.rb

@@ -1,4 +1,30 @@
 module ModelMacros
+  RSpec.shared_examples 'model has acceptable_attributes' do |cls, model_json|
+    describe '#attribute=' do
+      subject { cls.new(json) }
+
+      context 'json contains only expected attrs' do
+        let(:json) { model_json }
+        it { expect { subject }.not_to raise_error }
+        it 'receive each attributes' do
+          json.each_pair do |key, value|
+            expect(subject.send(key.intern)).to eq(value)
+          end
+        end
+      end
+
+      context 'json contains un-acceptable attrs' do
+        let(:json) { model_json.merge('_un_acceptable_key' => 'some_value') }
+        it { expect { subject }.not_to raise_error }
+        it 'receive each acceptable attributes' do
+          model_json.each_pair do |key, value|
+            expect(subject.send(key.intern)).to eq(value)
+          end
+        end
+      end
+    end
+  end
+
   RSpec.shared_examples 'the model is reloadable' do
     describe '#load' do
       before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinybucket
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - hirakiuc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -266,6 +266,7 @@ files:
 - lib/tinybucket/model/comment.rb
 - lib/tinybucket/model/commit.rb
 - lib/tinybucket/model/concerns.rb
+- lib/tinybucket/model/concerns/acceptable_attributes.rb
 - lib/tinybucket/model/concerns/reloadable.rb
 - lib/tinybucket/model/concerns/repository_keys.rb
 - lib/tinybucket/model/error_response.rb
@@ -294,6 +295,8 @@ files:
 - lib/tinybucket/response.rb
 - lib/tinybucket/response/error_handler.rb
 - lib/tinybucket/version.rb
+- spec/fixtures/branch_restriction.json
+- spec/fixtures/comment.json
 - spec/fixtures/commit.json
 - spec/fixtures/profile.json
 - spec/fixtures/pull_request.json
@@ -323,6 +326,7 @@ files:
 - spec/fixtures/repositories/test_owner/test_repo/pullrequests/get_state_open.json
 - spec/fixtures/repositories/test_owner/test_repo/watchers/get.json
 - spec/fixtures/repository.json
+- spec/fixtures/team.json
 - spec/fixtures/teams/test_team/followers/get.json
 - spec/fixtures/teams/test_team/following/get.json
 - spec/fixtures/teams/test_team/get.json
@@ -354,6 +358,7 @@ files:
 - spec/lib/tinybucket_spec.rb
 - spec/spec_helper.rb
 - spec/support/api_response_macros.rb
+- spec/support/fixture_macros.rb
 - spec/support/model_macros.rb
 - tinybucket.gemspec
 homepage: http://hirakiuc.github.io/tinybucket/
@@ -381,6 +386,8 @@ signing_key:
 specification_version: 4
 summary: ruby wrapper for the Bitbucket REST API (v2) with oauth
 test_files:
+- spec/fixtures/branch_restriction.json
+- spec/fixtures/comment.json
 - spec/fixtures/commit.json
 - spec/fixtures/profile.json
 - spec/fixtures/pull_request.json
@@ -410,6 +417,7 @@ test_files:
 - spec/fixtures/repositories/test_owner/test_repo/pullrequests/get_state_open.json
 - spec/fixtures/repositories/test_owner/test_repo/watchers/get.json
 - spec/fixtures/repository.json
+- spec/fixtures/team.json
 - spec/fixtures/teams/test_team/followers/get.json
 - spec/fixtures/teams/test_team/following/get.json
 - spec/fixtures/teams/test_team/get.json
@@ -441,5 +449,6 @@ test_files:
 - spec/lib/tinybucket_spec.rb
 - spec/spec_helper.rb
 - spec/support/api_response_macros.rb
+- spec/support/fixture_macros.rb
 - spec/support/model_macros.rb
 has_rdoc: