roar 0.12.9 → 1.0.0.beta1

data/test/lonely_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+require "roar/json/collection"
+require "roar/json/hash"
+
+class LonelyCollectionTest < MiniTest::Spec
+  it { Roar::JSON::Collection.must_equal Representable::JSON::Collection }
+  it { Roar::JSON::Hash.must_equal Representable::JSON::Hash }
+end

data/test/net_http_transport_test.rb

@@ -1,11 +1,11 @@
 require 'test_helper'
-require 'roar/representer/transport/net_http'
+require 'roar/transport/net_http'
 
 class NetHTTPTransportTest < MiniTest::Spec
   let(:url) { "http://localhost:4567/method" }
   let(:body) { "booty" }
   let(:as) { "application/xml" }
-  let (:transport) { Roar::Representer::Transport::NetHTTP.new }
+  let (:transport) { Roar::Transport::NetHTTP.new }
 
   it "#get_uri returns response" do
     transport.get_uri(:uri => url, :as => as).must_match_net_response :get, url, as
@@ -47,13 +47,13 @@ class NetHTTPTransportTest < MiniTest::Spec
 
   describe "basic auth" do
     it "raises when no credentials provided" do
-      assert_raises Roar::Representer::Transport::UnauthorizedError do
+      assert_raises Roar::Transport::UnauthorizedError do
         transport.get_uri(:uri => "http://localhost:4567/protected/bands/bodyjar", :as => "application/json")
       end
     end
 
     it "raises when wrong credentials provided" do
-      assert_raises Roar::Representer::Transport::UnauthorizedError do
+      assert_raises Roar::Transport::UnauthorizedError do
         transport.get_uri(:uri => "http://localhost:4567/protected/bands/bodyjar", :as => "application/json", :basic_auth => ["admin", "wrong--!!!--password"])
       end
     end

data/test/representer_test.rb

@@ -22,13 +22,13 @@ class RepresenterTest < MiniTest::Spec
   describe "Inheritance" do
     it "properly inherits properties from modules" do
       module PersonRepresentation
-        include Roar::Representer::JSON
+        include Roar::JSON
         property :name
       end
 
       class Person
         include AttributesConstructor
-        include Roar::Representer::JSON
+        include Roar::JSON
         include PersonRepresentation
         attr_accessor :name
       end

data/test/{lib/roar/representer/transport/net_http/request_test.rb → ssl_client_certs_test.rb}

@@ -1,9 +1,47 @@
 require 'test_helper'
-require 'roar/representer/transport/net_http/request'
 
-class NetHTTPTransportRequestTest < MiniTest::Spec
+require "roar"
+require 'roar/transport/net_http/request'
+require 'roar/transport/net_http'
 
-  describe Roar::Representer::Transport::NetHTTP::Request do
+
+class SslClientCertsTest < MiniTest::Spec
+
+  describe Roar::Transport::NetHTTP do
+
+    describe "instance methods" do
+
+      let(:url) { "http://www.bbc.co.uk" }
+      let(:as) { "application/xml" }
+
+      let(:transport) { Roar::Transport::NetHTTP.new }
+
+      describe "options passed to the request object (private #call method)" do
+
+        let(:options) { { uri: url, as: as, pem_file: "test/fixtures/sample.pem", ssl_verify_mode: "ssl_verify_mode" } }
+
+        describe "option handling" do
+
+          it "provides all options to the Request object" do
+
+            request_mock = MiniTest::Mock.new
+            request_mock.expect :call, nil, [Net::HTTP::Get]
+
+            options_assertions = lambda { |argument_options|
+              assert_equal argument_options, options
+              request_mock
+            }
+
+            Roar::Transport::NetHTTP::Request.stub :new, options_assertions do
+              transport.get_uri(options)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  describe Roar::Transport::NetHTTP::Request do
 
     describe "instance methods" do
       describe "#initialize" do
@@ -13,7 +51,7 @@ class NetHTTPTransportRequestTest < MiniTest::Spec
           let(:uri) { URI.parse("http://www.bbc.co.uk") }
           let(:options) { { uri: uri, pem_file: pem_file, ssl_verify_mode: ssl_verify_mode } }
 
-          let(:request) { Roar::Representer::Transport::NetHTTP::Request.new(options) }
+          let(:request) { Roar::Transport::NetHTTP::Request.new(options) }
           let(:net_http_instance) { request.instance_variable_get(:@http) }
           let(:ssl_verify_mode) { nil }
 
@@ -30,7 +68,7 @@ class NetHTTPTransportRequestTest < MiniTest::Spec
             end
 
             it "sets the client cert" do
-             assert_equal(net_http_instance.cert.to_s, cert.to_s)
+              assert_equal(net_http_instance.cert.to_s, cert.to_s)
             end
             it "sets the client key" do
               assert_equal(net_http_instance.key.to_s, key.to_s)

data/test/test_helper.rb

@@ -2,8 +2,8 @@ require 'minitest/autorun'
 require 'ostruct'
 
 require 'roar/representer'
-require 'roar/representer/feature/http_verbs'
-require 'roar/representer/json/hal'
+require 'roar/http_verbs'
+require 'roar/json/hal'
 
 module AttributesConstructor  # TODO: remove me.
   def initialize(attrs={})
@@ -24,16 +24,16 @@ class Album < OpenStruct
 end
 
 require "test_xml/mini_test"
-require "roar/representer/xml"
+require "roar/xml"
 
 require "integration/runner"
 
 MiniTest::Spec.class_eval do
   def link(options)
-    Roar::Representer::Feature::Hypermedia::Hyperlink.new(options)
+    Roar::Hypermedia::Hyperlink.new(options)
   end
 
-  def self.representer_for(modules=[Roar::Representer::JSON, Roar::Representer::Feature::Hypermedia], &block)
+  def self.representer_for(modules=[Roar::JSON, Roar::Hypermedia], &block)
     let (:rpr) do
       Module.new do
         include *modules.reverse
@@ -51,3 +51,10 @@ MiniTest::Spec.class_eval do
     %w(get post put delete).each(&block)
   end
 end
+
+
+Roar::Hypermedia::Hyperlink.class_eval do
+  def ==(b)
+    @attrs == b.instance_variable_get(:@attrs)
+  end
+end

data/test/xml_representer_test.rb

@@ -1,192 +1,52 @@
 require 'test_helper'
 
-class ItemRepresenter
-  include AttributesConstructor
-  include Roar::Representer::XML
-  self.representation_wrap= :item
-  property :value
-  attr_accessor :value
-end
-
-class PositionRepresenter
-  include AttributesConstructor
-  include Roar::Representer::XML
-  self.representation_wrap= :position
-  property :id
-  property :item, :class => ItemRepresenter
-  attr_accessor :id, :item
-end
-
-
 class XMLRepresenterFunctionalTest < MiniTest::Spec
-  class Order
-    include AttributesConstructor
-    attr_accessor :id, :items
-  end
-
-  class GreedyOrder < Order
-  end
+  module OrderRepresenter
+    include Roar::XML
 
-  class TestXmlRepresenter
-    include Roar::Representer::XML
-    self.representation_wrap= :order
     property :id
-    attr_accessor :id
+    self.representation_wrap = :order
   end
 
+  Order = Struct.new(:id, :items)
 
-  describe "XMLRepresenter" do
-    before do
-      @m = {"id" => "1"}
-      @o = Order.new(@m)
+  describe "#to_xml" do
+    let (:order) { Order.new(1).extend(OrderRepresenter) }
 
-      @r = TestXmlRepresenter.new
-      @i = ItemRepresenter.new
-      @i.value = "Beer"
-    end
+    # empty model
+    it { Order.new.extend(OrderRepresenter).to_xml.must_equal_xml "<order/>" }
 
-    describe "#to_xml" do
-      it "serializes the model" do
-        assert_xml_equal "<order/>", @r.to_xml
+    # populated model
+    it { order.to_xml.must_equal_xml "<order><id>1</id></order>" }
 
-        @r.id = 1
-        assert_xml_equal "<order><id>1</id></order>", @r.to_xml
-
-        @r.id = 2
-        assert_xml_equal "<rap><id>2</id></rap>", @r.to_xml(:wrap => :rap)
-      end
-
-      it "is aliased by #serialize" do
-        assert_equal @r.to_xml, @r.serialize
-      end
-
-      it "accepts :include and :exclude" do
-        assert_equal '<order/>', @r.to_xml(:exclude => [:id])
-      end
-    end
-
-    describe "#from_xml" do
-      it "deserializes object" do
-        @order = Order.new.from_xml("<order><id>1</id></order>")
-        assert_equal "1", @order.id
-      end
-
-      it "is aliased by #deserialize" do
-        @order = Order.new.deserialize("<order><id>1</id></order>")
-        assert_equal "1", @order.id
-      end
-
-      it "accepts :include and :exclude" do
-        @order = Order.new.deserialize("<order><id>1</id></order>", :exclude => [:id])
-        assert_equal nil, @order.id
-      end
-    end
-
-
-    describe "XML.from_xml" do
-      class Order
-        include Roar::Representer::XML
-        property :id
-        property :pending
-        attr_accessor :id, :pending
-      end
-
-      it "is aliased to #deserialize" do
-        assert_equal TestXmlRepresenter.from_xml("<order/>").id, TestXmlRepresenter.deserialize("<order/>").id
-      end
-
-      it "accepts :exclude option" do
-        order = Order.from_xml(%{<order><id>1</id><pending>1</pending></order>}, :exclude => [:id])
-        assert_equal nil, order.id
-        assert_equal "1", order.pending
-      end
-
-      it "accepts :include option" do
-        order = Order.from_xml(%{<order><id>1</id><pending>1</pending></order>}, :include => [:id])
-        assert_equal "1", order.id
-        assert_equal nil, order.pending
-      end
-    end
+    # with wrap
+    it { order.to_xml(wrap: :rap).must_equal_xml "<rap><id>1</id></rap>" }
 
+    # aliased to #serialize
+    it { order.to_xml.must_equal order.serialize }
 
-    describe "without options" do
-      it ".from_xml returns the deserialized model" do
-        @m = TestXmlRepresenter.from_xml("<order><id>1</id></order>")
-        assert_equal "1", @m.id
-      end
-
-      #it ".from_xml still works with nil" do
-      #  assert TestXmlRepresenter.from_xml(nil)
-      #end
-
-    end
-
-
-    describe "with a typed attribute" do
-      before do
-        @r = PositionRepresenter.new("id" => "1")
-      end
-
-      it "#serialize skips empty :item" do
-        assert_xml_equal "<position><id>1</id></position>", @r.to_xml
-      end
-
-      it "#to_xml delegates to ItemRepresenter#to_xml" do
-        @r.item = @i
-        assert_xml_equal "<position><id>1</id><item><value>Beer</value></item></position>", @r.to_xml
-      end
-
-      it ".from_xml typecasts :item" do
-        @m = PositionRepresenter.from_xml("<position><id>1</id><item><value>beer</value></item>\n</position>")
-
-        assert_equal "1",     @m.id
-        assert_equal "beer",  @m.item.value
-      end
-    end
-
-
-    describe "with a typed list" do
-      before do
-        @c = Class.new do
-          include AttributesConstructor
-          include Roar::Representer::XML
-
-          self.representation_wrap= :order
-          property :id
-          collection :items, :class => ItemRepresenter, :as => :item
-          attr_accessor :id, :items
-        end
-
-        @r = @c.new("id" => 1)
-      end
-
-      it "#serialize_model skips empty :item" do
-        assert_xml_equal "<order><id>1</id></order>", @r.to_xml
-      end
-
-      it "#serialize delegates to ItemXmlRepresenter#to_xml in list" do
-        @r.items = [ItemRepresenter.new("value" => "Bier")]
+    # accepts options
+    it { order.to_xml(exclude: [:id]).must_equal_xml "<order/>" }
+  end
 
-        assert_xml_equal "<order><id>1</id><item><value>Bier</value></item></order>",
-          @r.to_xml
-      end
+  describe "#from_xml" do
+    let (:order) { Order.new.extend(OrderRepresenter) }
 
-      it ".from_xml typecasts list" do
-        @m = @c.from_xml("<order><id>1</id><item><value>beer</value></item>\n</order>")
+    # parses
+    it { order.from_xml("<order><id>1</id></order>").id.must_equal "1" }
 
-        assert_equal "1",     @m.id
-        assert_equal 1,       @m.items.size
-        assert_equal "beer",  @m.items.first.value
-      end
-    end
+    # aliased to #deserialize
+    it { order.deserialize("<order><id>1</id></order>").id.must_equal "1" }
 
+    # accepts options
+    it { order.from_xml("<order><id>1</id></order>", exclude: [:id]).id.must_equal nil }
   end
 end
 
 class XmlHyperlinkRepresenterTest < MiniTest::Spec
   describe "API" do
     before do
-      @link = Roar::Representer::Feature::Hypermedia::Hyperlink.new.extend(Roar::Representer::XML::HyperlinkRepresenter).from_xml(%{<link rel="self" href="http://roar.apotomo.de" media="web"/>})
+      @link = Roar::Hypermedia::Hyperlink.new.extend(Roar::XML::HyperlinkRepresenter).from_xml(%{<link rel="self" href="http://roar.apotomo.de" media="web"/>})
     end
 
     it "responds to #rel" do

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.12.9
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +62,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.4.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -100,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -146,23 +160,26 @@ files:
 - TODO.markdown
 - examples/example.rb
 - examples/example_server.rb
-- gemfiles/Gemfile.representable-1.7
-- gemfiles/Gemfile.representable-1.8
+- gemfiles/Gemfile.representable-2.0
+- gemfiles/Gemfile.representable-2.1
 - lib/roar.rb
+- lib/roar/client.rb
+- lib/roar/coercion.rb
 - lib/roar/decorator.rb
+- lib/roar/http_verbs.rb
+- lib/roar/hypermedia.rb
+- lib/roar/json.rb
+- lib/roar/json/collection.rb
+- lib/roar/json/collection_json.rb
+- lib/roar/json/hal.rb
+- lib/roar/json/hash.rb
+- lib/roar/json/json_api.rb
 - lib/roar/representer.rb
-- lib/roar/representer/feature/client.rb
-- lib/roar/representer/feature/coercion.rb
-- lib/roar/representer/feature/http_verbs.rb
-- lib/roar/representer/feature/hypermedia.rb
-- lib/roar/representer/json.rb
-- lib/roar/representer/json/collection_json.rb
-- lib/roar/representer/json/hal.rb
-- lib/roar/representer/transport/faraday.rb
-- lib/roar/representer/transport/net_http.rb
-- lib/roar/representer/transport/net_http/request.rb
-- lib/roar/representer/xml.rb
+- lib/roar/transport/faraday.rb
+- lib/roar/transport/net_http.rb
+- lib/roar/transport/net_http/request.rb
 - lib/roar/version.rb
+- lib/roar/xml.rb
 - roar.gemspec
 - test/client_test.rb
 - test/coercion_feature_test.rb
@@ -180,10 +197,13 @@ files:
 - test/integration/runner.rb
 - test/integration/server.rb
 - test/integration/ssl_server.rb
+- test/json_api_test.rb
 - test/json_representer_test.rb
-- test/lib/roar/representer/transport/net_http/request_test.rb
+- test/lib/runner.rb
+- test/lonely_test.rb
 - test/net_http_transport_test.rb
 - test/representer_test.rb
+- test/ssl_client_certs_test.rb
 - test/test_helper.rb
 - test/xml_representer_test.rb
 homepage: http://rubygems.org/gems/roar
@@ -201,9 +221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2