pdc 0.1.4 → 0.1.5

data/lib/pdc/resource/attributes.rb

@@ -27,7 +27,7 @@ module PDC::Resource
       end
 
       def attributes_metadata
-        @attributes_metadata ||= HashWithIndifferentAccess.new(primary_key => default_metadata )
+        @attributes_metadata ||= HashWithIndifferentAccess.new(primary_key => default_metadata)
       end
 
       def attribute_parser(name)
@@ -38,30 +38,30 @@ module PDC::Resource
 
       private
 
-        def default_metadata
-          { parser: ValueParser }
-        end
+      def default_metadata
+        { parser: ValueParser }
+      end
 
-        def define_methods_in_container(names)
-          instance_method_container.module_eval do
-            Array.wrap(names).each do |name|
-              define_method(name) do
-                attribute(name)
-              end
+      def define_methods_in_container(names)
+        instance_method_container.module_eval do
+          Array.wrap(names).each do |name|
+            define_method(name) do
+              attribute(name)
             end
           end
         end
+      end
 
-        # By adding instance methods via an included module, they become
-        # overridable with "super".
-        # see: http://thepugautomatic.com/2013/07/dsom/
-        def instance_method_container
-          unless @instance_method_container
-            @instance_method_container = Module.new
-            include @instance_method_container
-          end
-          @instance_method_container
+      # By adding instance methods via an included module, they become
+      # overridable with "super".
+      # see: http://thepugautomatic.com/2013/07/dsom/
+      def instance_method_container
+        unless @instance_method_container
+          @instance_method_container = Module.new
+          include @instance_method_container
         end
+        @instance_method_container
+      end
     end # class methods
 
     def initialize(attributes = {})
@@ -90,10 +90,9 @@ module PDC::Resource
     end
 
     def method_missing(name, *args, &block)
-      case
-      when attribute?(name)   then attribute(name)
-      when predicate?(name)   then predicate(name)
-      when setter?(name)      then set_attribute(name, args.first)
+      if attribute?(name) then attribute(name)
+      elsif predicate?(name)   then predicate(name)
+      elsif setter?(name)      then set_attribute(name, args.first)
       else super
       end
     end
@@ -138,7 +137,5 @@ module PDC::Resource
     def inspect_attributes
       attributes.map { |k, v| "#{k}: #{v.inspect}" }.join(' ')
     end
-
   end
 end
-

data/lib/pdc/resource/identity.rb

@@ -55,7 +55,7 @@ module PDC::Resource
     def ==(other)
       other.instance_of?(self.class) && id? && id == other.id
     end
-    alias :eql? :==
+    alias eql? ==
 
     def as_json(options = nil)
       attributes.as_json(options)
@@ -66,10 +66,11 @@ module PDC::Resource
     end
 
     private
-      # helper method so that primary_key can be called directly
-      # from an instance
-      def primary_key
-        self.class.primary_key
-      end
+
+    # helper method so that primary_key can be called directly
+    # from an instance
+    def primary_key
+      self.class.primary_key
+    end
   end
 end

data/lib/pdc/resource/path.rb

@@ -2,7 +2,6 @@ require 'uri_template'
 
 module PDC::Resource
   class Path
-
     def initialize(pattern, params = {})
       @pattern = pattern
       @params = params.symbolize_keys
@@ -36,7 +35,7 @@ module PDC::Resource
     end
 
     def pattern_with_rfc_style_parens
-      @pattern.gsub('(', '{').gsub(')', '}')
+      @pattern.tr('(', '{').tr(')', '}')
     end
 
     def validate_required_params!
@@ -56,8 +55,7 @@ module PDC::Resource
     end
 
     def required_params
-      @pattern.scan(/\/:(\w+)/).flatten.map(&:to_sym)
+      @pattern.scan(%r{/:(\w+)}).flatten.map(&:to_sym)
     end
   end
 end
-

data/lib/pdc/resource/per_thread_registry.rb

@@ -38,17 +38,19 @@ module PDC::Resource
     def self.extended(object)
       object.instance_variable_set '@per_thread_registry_key', object.name.freeze
     end
+
     def instance
       Thread.current[@per_thread_registry_key] ||= new
     end
+
     protected
-      def method_missing(name, *args, &block) # :nodoc:
-        # Caches the method definition as a singleton method of the receiver.
-        #
-        # By letting #delegate handle it, we avoid an enclosure that'll capture args.
-        singleton_class.delegate name, to: :instance
-        send(name, *args, &block)
-      end
+
+    def method_missing(name, *args, &block) # :nodoc:
+      # Caches the method definition as a singleton method of the receiver.
+      #
+      # By letting #delegate handle it, we avoid an enclosure that'll capture args.
+      singleton_class.delegate name, to: :instance
+      send(name, *args, &block)
+    end
   end
 end
-

data/lib/pdc/resource/relation/finder.rb

@@ -16,9 +16,9 @@ module PDC::Resource
     end
 
     private
+
     def result
       @result ||= fetch(clone)
     end
   end
 end
-

data/lib/pdc/resource/relation/pagination.rb

@@ -3,7 +3,7 @@ module PDC::Resource
   PAGINATION_KEYS = [
     :resource_count,
     :previous_page,
-    :next_page,
+    :next_page
   ].freeze
 
   module Pagination

data/lib/pdc/resource/relation/query.rb

@@ -11,4 +11,3 @@ module PDC::Resource
     end
   end
 end
-

data/lib/pdc/resource/relation.rb

@@ -13,7 +13,7 @@ module PDC::Resource
     attr_reader :klass
     attr_writer :params
 
-    alias :all :to_a
+    alias all to_a
 
     def initialize(klass, options = {})
       @klass = klass
@@ -63,19 +63,20 @@ module PDC::Resource
 
     private
 
-      def method_missing(name, *args, &block)
-        # pass anything that relation doesn't know to the klass
-        super unless klass.respond_to? name
+    def method_missing(name, *args, &block)
+      # pass anything that relation doesn't know to the klass
+      super unless klass.respond_to? name
 
-        with_scope { klass.send(name, *args, &block) }
-      end
+      with_scope { klass.send(name, *args, &block) }
+    end
 
-      # Keep hold of current scope while running a method on the class
-      def with_scope
-        previous, klass.current_scope = klass.current_scope, self
-        yield
-      ensure
-        klass.current_scope = previous
-      end
+    # Keep hold of current scope while running a method on the class
+    def with_scope
+      previous = klass.current_scope
+      klass.current_scope = self
+      yield
+    ensure
+      klass.current_scope = previous
+    end
   end
 end

data/lib/pdc/resource/rest_api.rb

@@ -13,7 +13,8 @@ module PDC::Resource
           response = connection.send(method) do |request|
             request.url path, query
           end
-          payload[:url], payload[:status] = response.env.url, response.status
+          payload[:url] = response.env.url
+          payload[:status] = response.status
           PDC::Http::Result.new(response)
         end
       end
@@ -35,7 +36,5 @@ module PDC::Resource
       @url = connection.build_url(uri).to_s
     end
     attr_reader :url
-
   end
 end
-

data/lib/pdc/resource/value_parser.rb

@@ -14,18 +14,17 @@ module PDC::Resource
   class ValueParser
     class << self
       def parse(value)
-        case
-        when value.is_a?(Array)     then value.map { |v| parse(v) }
-        when value.is_a?(Hash)      then OpenStruct.new(parse_hash(value))
+        if value.is_a?(Array) then value.map { |v| parse(v) }
+        elsif value.is_a?(Hash) then OpenStruct.new(parse_hash(value))
         else value
         end
       end
 
       private
 
-        def parse_hash(hash)
-          hash.map { |k, v| [k.to_sym, parse(v)] }.to_h
-        end
+      def parse_hash(hash)
+        hash.map { |k, v| [k.to_sym, parse(v)] }.to_h
+      end
     end
   end
 end

data/lib/pdc/v1/product.rb

@@ -2,4 +2,3 @@ module PDC::V1
   class Product < PDC::Base
   end
 end
-

data/lib/pdc/v1/release.rb

@@ -12,7 +12,7 @@ module PDC
 
       # TODO: implement using has_many association
       # has_many :variants, class_name: 'PDC::V1::ReleaseVariant',
-               # uri: "#{api_path}/release-variants/?release=:release_id"
+      # uri: "#{api_path}/release-variants/?release=:release_id"
     end
   end
 end

data/lib/pdc/v1/release_rpm_mapping.rb

@@ -0,0 +1,9 @@
+module PDC::V1
+  class ReleaseRpmMapping < PDC::Base
+    attributes :compose, :mapping
+
+    def self.uri
+      @uri = PDC.config.site + '/rest_api/v1/releases/(:release_id)/rpm-mapping/(:package)/'
+    end
+  end
+end

data/lib/pdc/v1/release_variant.rb

@@ -22,7 +22,6 @@ module PDC::V1
     # attribute_rename :release, :release_id
 
     # belongs_to :release, class_name: 'PDC::V1::Release',
-               # uri: "#{api_path}/releases/:release_id"
+    # uri: "#{api_path}/releases/:release_id"
   end
 end
-

data/lib/pdc/v1.rb

@@ -4,5 +4,6 @@ module PDC
     require 'pdc/v1/arch'
     require 'pdc/v1/release'
     require 'pdc/v1/release_variant'
+    require 'pdc/v1/release_rpm_mapping'
   end
 end

data/lib/pdc/version.rb

@@ -1,3 +1,3 @@
 module PDC
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'.freeze
 end

data/spec/fixtures/vcr/must_has_compose.yml

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://pdc.host.dev.eng.pek2.redhat.com//rest_api/v1/releases/rhel-7.1/rpm%2Dmapping/tuned/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Faraday v0.9.2
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      date:
+      - Tue, 10 Jan 2017 06:35:08 GMT
+      server:
+      - Apache/2.4.6 (Red Hat Enterprise Linux) OpenSSL/1.0.1e-fips mod_auth_kerb/5.4
+        mod_wsgi/3.4 Python/2.7.5
+      expires:
+      - Tue, 10 Jan 2017 06:35:40 GMT
+      vary:
+      - Accept,Cookie
+      last-modified:
+      - Tue, 10 Jan 2017 06:35:10 GMT
+      allow:
+      - GET, HEAD, OPTIONS
+      cache-control:
+      - max-age=30
+      x-frame-options:
+      - SAMEORIGIN
+      transfer-encoding:
+      - chunked
+      content-type:
+      - application/json
+    body:
+      encoding: UTF-8
+      string: '{"compose":"RHEL-7.1-20150219.1","mapping":{"Workstation":{"x86_64":{"tuned-utils":["noarch"],"tuned":["noarch","src"]}},"Workstation-optional":{"x86_64":{"tuned-gtk":["noarch"],"tuned-profiles-compat":["noarch"],"tuned-profiles-atomic":["noarch"],"tuned-utils-systemtap":["noarch"]}},"Server-SAP":{"x86_64":{"tuned-profiles-sap":["noarch"]}},"Server":{"x86_64":{"tuned-utils":["noarch"],"tuned":["noarch","src"]},"s390x":{"tuned-utils":["noarch"],"tuned":["noarch","src"]},"ppc64":{"tuned-utils":["noarch"],"tuned":["noarch","src"]}},"ComputeNode":{"x86_64":{"tuned-utils":["noarch"],"tuned":["noarch","src"]}},"Server-optional":{"x86_64":{"tuned-gtk":["noarch"],"tuned-profiles-compat":["noarch"],"tuned-profiles-atomic":["noarch"],"tuned-utils-systemtap":["noarch"]},"s390x":{"tuned-gtk":["noarch"],"tuned-profiles-compat":["noarch"],"tuned-profiles-atomic":["noarch"],"tuned-utils-systemtap":["noarch"]},"ppc64":{"tuned-gtk":["noarch"],"tuned-profiles-compat":["noarch"],"tuned-profiles-atomic":["noarch"],"tuned-utils-systemtap":["noarch"]}},"Client":{"x86_64":{"tuned-utils":["noarch"],"tuned":["noarch","src"]}},"ComputeNode-optional":{"x86_64":{"tuned-gtk":["noarch"],"tuned-profiles-compat":["noarch"],"tuned-profiles-atomic":["noarch"],"tuned-utils-systemtap":["noarch"]}},"Client-optional":{"x86_64":{"tuned-gtk":["noarch"],"tuned-profiles-compat":["noarch"],"tuned-profiles-atomic":["noarch"],"tuned-utils-systemtap":["noarch"]}}}}'
+    http_version: 
+  recorded_at: Tue, 10 Jan 2017 06:35:44 GMT
+recorded_with: VCR 3.0.3

data/spec/pdc/config_spec.rb

@@ -147,8 +147,8 @@ describe PDC do
       PDC::Base.connection.must_equal old_connection
 
       new_connection = PDC.configure do |config|
-       config.site = 'http://localhost:8888'
-       config.token = :foobar
+        config.site = 'http://localhost:8888'
+        config.token = :foobar
       end
       PDC::Base.connection.must_equal new_connection
       new_connection.wont_equal old_connection

data/spec/pdc/resource/attributes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PDC::Resource::AttributeStore  do
+describe PDC::Resource::AttributeStore do
   subject { PDC::Resource::AttributeStore }
 
   it '#to_params' do
@@ -165,7 +165,6 @@ describe 'nested hash attributes' do
   end
 end
 
-
 describe 'Custom ValueParser' do
   subject { CustomParserModel }
   it 'must return fixnum for age' do
@@ -184,48 +183,49 @@ end
 
 # class AttributesTest < MiniTest::Test
 
-  # def test_equality
-    # assert_equal Product.new(id: 2, title: 'Fish'), Product.new(id: 2, title: 'Fish')
-    # refute_equal Product.new(id: 2, title: 'Fish'), Product.new(id: 1, title: 'Fish')
-    # refute_equal Product.new(id: 2, title: 'Fish'), 'not_a_spyke_object'
-    # refute_equal Product.new(id: 2, title: 'Fish'), Image.new(id: 2, title: 'Fish')
-    # refute_equal Product.new, Product.new
-    # refute_equal StepImage.new(id: 1), Image.new(id: 1)
-  # end
-
-  # def test_uniqueness
-    # product_1 = Product.new(id: 1)
-    # product_2 = Product.new(id: 1)
-    # product_3 = Product.new(id: 2)
-    # image_1 = Image.new(id: 2)
-    # records = [product_1, product_2, product_3, image_1]
-    # assert_equal [product_1, product_3, image_1], records.uniq
-  # end
-
-  # def test_super_with_explicit_attributes
-    # assert_equal nil, Product.new.description
-  # end
-
-  # def test_inheriting_explicit_attributes
-    # assert_equal nil, Image.new.description
-    # assert_equal nil, Image.new.caption
-    # assert_raises NoMethodError do
-      # Image.new.note
-    # end
-    # assert_equal nil, StepImage.new.description
-    # assert_equal nil, StepImage.new.caption
-    # assert_equal nil, StepImage.new.note
-  # end
-
-  # def test_inspect
-    # product = Product.new(id: 2, title: 'Pizza', description: 'Delicious')
-    # assert_equal '#<Product(products/(:id)) id: 2 title: "Pizza" description: "Delicious">', product.inspect
-    # product = Product.new
-    # assert_equal '#<Product(products/(:id)) id: nil >', product.inspect
-    # require 'pry'; binding.pry
-    # user = Product.new.build_user
-    # assert_equal '#<User(users/:uuid) id: nil >', user.inspect
-    # group = Product.new.groups.build
-    # assert_equal '#<Group(products/:product_id/groups/(:id)) id: nil product_id: nil>', group.inspect
-  # end
+# def test_equality
+# assert_equal Product.new(id: 2, title: 'Fish'), Product.new(id: 2, title: 'Fish')
+# refute_equal Product.new(id: 2, title: 'Fish'), Product.new(id: 1, title: 'Fish')
+# refute_equal Product.new(id: 2, title: 'Fish'), 'not_a_spyke_object'
+# refute_equal Product.new(id: 2, title: 'Fish'), Image.new(id: 2, title: 'Fish')
+# refute_equal Product.new, Product.new
+# refute_equal StepImage.new(id: 1), Image.new(id: 1)
+# end
+
+# def test_uniqueness
+# product_1 = Product.new(id: 1)
+# product_2 = Product.new(id: 1)
+# product_3 = Product.new(id: 2)
+# image_1 = Image.new(id: 2)
+# records = [product_1, product_2, product_3, image_1]
+# assert_equal [product_1, product_3, image_1], records.uniq
+# end
+
+# def test_super_with_explicit_attributes
+# assert_equal nil, Product.new.description
+# end
+
+# def test_inheriting_explicit_attributes
+# assert_equal nil, Image.new.description
+# assert_equal nil, Image.new.caption
+# assert_raises NoMethodError do
+# Image.new.note
+# end
+# assert_equal nil, StepImage.new.description
+# assert_equal nil, StepImage.new.caption
+# assert_equal nil, StepImage.new.note
+# end
+
+# def test_inspect
+# product = Product.new(id: 2, title: 'Pizza', description: 'Delicious')
+# output = '#<Product(products/(:id)) id: 2 title: "Pizza" description: "Delicious">'
+# assert_equal output, product.inspect
+# product = Product.new
+# assert_equal '#<Product(products/(:id)) id: nil >', product.inspect
+# require 'pry'; binding.pry
+# user = Product.new.build_user
+# assert_equal '#<User(users/:uuid) id: nil >', user.inspect
+# group = Product.new.groups.build
+# assert_equal '#<Group(products/:product_id/groups/(:id)) id: nil product_id: nil>', group.inspect
+# end
 # end

data/spec/pdc/resource/cache_spec.rb

@@ -28,7 +28,6 @@ def record_cache_access(&block)
   cache_access
 end
 
-
 describe 'Caching' do
   before do
     @old_config = PDC.config

data/spec/pdc/resource/count_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-#WebMock.disable!  # enable to re-record
+# WebMock.disable!  # enable to re-record
 
 describe PDC do
   before do
@@ -38,7 +38,7 @@ describe PDC do
       pg2 = arch.page(2)
       pg2_count = pg2.all.length
 
-      arches_count = pg2.count      # must return all arches count
+      arches_count = pg2.count # must return all arches count
       arches_count.wont_equal pg2_count
     end
   end

data/spec/pdc/resource/identity_spec.rb

@@ -66,7 +66,6 @@ describe CustomPrimaryKeyModel do
   end
 end
 
-
 describe V1::Foobar do
   subject { V1::Foobar }
   it 'must have a pkey' do

data/spec/pdc/resource/pagination_spec.rb

@@ -14,7 +14,7 @@ describe PDC do
     let(:release_variant) { PDC::V1::ReleaseVariant }
 
     it 'can iterate using each' do
-      count = arch.count   # makes single call
+      count = arch.count # makes single call
 
       all = arch.scoped.each_with_object([]) do |a, o|
         o << a
@@ -37,13 +37,13 @@ describe PDC do
     subject { PDC::V1::Arch }
     it 'returns resources on that page' do
       pg2 = subject.page(2)
-      resources =  pg2.contents!
+      resources = pg2.contents!
       resources.length.must_equal 20
     end
 
     it 'should not be in the list of attributes' do
       pg2 = subject.page(2)
-      arch =  pg2.all.first
+      arch = pg2.all.first
       arch.attributes.wont_include :page
       arch.attributes.wont_include 'page'
     end

data/spec/pdc/resource/path_spec.rb

@@ -17,14 +17,19 @@ describe PDC::Resource::Path do
     assert_equal '/users/1/recipes', path.expanded
   end
 
-
   it 'nested_resource_path' do
-    assert_equal '/users/1/recipes/2', subject.new('/users/:user_id/recipes/:id', user_id: 1, id: 2).expanded
+    expanded_path = subject.new(
+      '/users/:user_id/recipes/:id',
+      user_id: 1,
+      id: 2
+    ).expanded
+    assert_equal '/users/1/recipes/2', expanded_path
   end
 
   it 'raises if required_params are missing' do
-    lambda {
-      subject.new('/users/:user_id/recipes/(:id)', id: 2).expanded
-    }.must_raise PDC::InvalidPathError, 'Missing required params: user_id in /users/:user_id/recipes/(:id)'
+    l = -> { subject.new('/users/:user_id/recipes/(:id)', id: 2).expanded }
+
+    err = 'Missing required params: user_id in /users/:user_id/recipes/(:id)'
+    l.must_raise PDC::InvalidPathError, err
   end
 end

data/spec/pdc/resource/relation_spec.rb

@@ -8,11 +8,11 @@ class SearchableModel < Base
     [
       { name: 'foobar-1', product: 'prod' },
       { name: 'foobar-2', product: 'prod' },
-      { name: 'foobar-3', product: 'prod' },
+      { name: 'foobar-3', product: 'prod' }
     ]
   end
 
-  def self.fetch(params)
+  def self.fetch(_params)
     response = OpenStruct.new(
       body: { data: fake_data },
       status: 200,
@@ -26,7 +26,6 @@ end
 describe SearchableModel do
   subject { SearchableModel }
 
-
   describe '#where' do
     it 'returns a scope with params' do
       filters = { name: :foobar, age: 10 }

data/spec/pdc/v1/arch_spec.rb

@@ -28,7 +28,7 @@ describe PDC do
     pg2 = arch.page(2)
     pg2_count = pg2.all.length
 
-    arches_count = pg2.count      # must return all arches count
+    arches_count = pg2.count # must return all arches count
     arches_count.wont_equal pg2_count
   end
 end

data/spec/pdc/v1/release_rpm_mapping_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe PDC::V1::ReleaseRpmMapping do
+  before do
+    VCR.insert_cassette fixture_name
+  end
+
+  after do
+    VCR.eject_cassette
+  end
+
+  let(:mapping) { PDC::V1::ReleaseRpmMapping.where(release_id: 'rhel-7.1', package: 'tuned').first }
+  it 'must has compose' do
+    mapping.mapping.must_be_instance_of OpenStruct
+  end
+end

data/spec/pdc/v1/release_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-#WebMock.disable!  # enable to re-record
+# WebMock.disable!  # enable to re-record
 
 describe PDC::V1::Release do
   before do
@@ -47,7 +47,7 @@ describe PDC::V1::Release do
       rhel7_1 = release.find('rhel-7.1')
       variants = rhel7_1.variants.all
       variants.length.must_equal 12
-      releases = variants.map {|v| v.release }
+      releases = variants.map(&:release)
       releases.must_equal [rhel7_1] * variants.length
     end
   end