ddex 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76db225ee4e588bb9465ab9801b6ee5bbe6b4dd
-  data.tar.gz: c80d0d61497678b6973aa2f824cb7d56565ab91f
+  metadata.gz: f1e503ee8c9b64cdc868dfe83bba27d50c612e4d
+  data.tar.gz: 6c3bb7e287fdaf144f9d96f474e4698bee6af06d
 SHA512:
-  metadata.gz: d3ca2feb13983f100d20677cd7de6953dca9e03548d9ff6fa37a8d70f45e36fda273ef1c77fd735cb40fe3a2354137d51941a95d093c53f9449d0512c1a414df
-  data.tar.gz: 56fa38d1de3bca0de8fe49a93eb5c38d68df83c5b3bf17b9e56d2b791eff094de3936c0125dea08e02153e3c486f516f224f3c9d89c7ae99170c73592d5e1348
+  metadata.gz: 58a9d8c2f79818788ede896a42b56f1e82ec2b8f5d4e865fbc1d1ab67f4428a1d34d10de48d390de5d10157f410350ea4d25bb9597f864bcdd6bf4fe229fd550
+  data.tar.gz: a3c81b9921a50871a6a281c676e5cb0b92467b4d954c646e84a86201e3278ce042e246c708a21f6f9fbde404ca4e073dcd520b14eea82b426b4c90c60d316497

data/README.rdoc

@@ -121,7 +121,7 @@ The specification version is determined by the <code>MessageSchemaVersionId</cod
 
 By default the <code>MessageSchemaVersionId</code> is assumed to be in <code>SPEC/VERSION</code> format (any leading, trailing, or duplicate slashes will be stripped),
 as this seems to be the convention used by most instance docs -though the DDEX specifications
-{are not strict about this}[http://www.ddex.net/content/format-messageschemaversionid]. If you're dealing with <code>MessageSchemaVersionId</code>s
+{are not strict about this}[http://www.ddex.net/format-messageschemaversionid]. If you're dealing with <code>MessageSchemaVersionId</code>s
 that vary from this format, and explicitly setting the version is not practical, you can set the global default(s):
 
   DDEX::ERN.config["V35"][:message_schema_version_id] = "ern tray_fever!"
@@ -137,6 +137,37 @@ be modified to accommodate something more than <code>SPEC/VERSION</code> out of
 
 Not yet!
 
+=== DDEX Parsing Service (Rack Endpoint)
+
+If you want to parse DDEX metadata but don't want to use Ruby to process the results you can setup a parsing service
+using <code>Rack::DDEX</code>. <code>Rack::DDEX</code> is a {Rack endpoint}[http://rack.github.io] that parses a DDEX file
+and returns JSON.
+
+For example, from the repository's root:
+
+  ~/code/ruby/ddex >cat etc/config.ru
+  require "rack/ddex"
+
+  run Rack::DDEX.new
+
+  ~/code/ruby/ddex >rackup -I lib etc/config.ru  # Note that -D has problems with autoloading
+  [2014-12-15 20:35:40] INFO  WEBrick 1.3.1
+  [2014-12-15 20:35:40] INFO  ruby 2.1.2 (2014-05-08) [x86_64-darwin13.0]
+  [2014-12-15 20:35:40] INFO  WEBrick::HTTPServer#start: pid=76385 port=9292
+
+Then, from another terminal
+
+  ~/code/ruby/ddex >curl -d @spec/fixtures/ern/36/instance1.xml http://localhost:9292
+  {"message_header":{"message_thread_id":"Bu._UcZLsNbTVitjYnci","message_id":"DbVn-iuUB-SiHl05B2IqW3_","message_file_name":"wz9RHX_Eu1d"
+  ...
+
+  ~/code/ruby/ddex >curl http://localhost:9292  # HTTP 400
+  {"error":"XML parsing error: Start tag expected, '<' not found"}
+
+=== Contributing
+
+See CONTRIBUTING.md
+
 === More Info
 
 * {Source code}[https://github.com/sshaw/ddex]
@@ -156,7 +187,7 @@ Not yet!
     xml_accessor :x, :as => AnotherClass
 
     # Then
-    x = SomeClass.new(:x => "123") 
+    x = SomeClass.new(:x => "123")
     x.to_xml  # undefined method `to_xml' for "123":String
 
   Raised here: https://github.com/Empact/roxml/blob/v2.5.1/lib/roxml/xml/references.rb#L262

data/lib/ddex/ern.rb

@@ -146,7 +146,9 @@ module DDEX
 
       # Some normalization
       v = version.strip.gsub(%r{//+}, "/").gsub(%r{\A/|/\Z}, "")
-      klass, _ = config.find { |name, cfg| cfg[:message_schema_version_id] == v }
+      klass, _ = config.find do |name, cfg|
+        cfg[:message_schema_version_id] == v || cfg[:version] == v
+      end
       raise_unknown_version(version) unless klass
 
       # >= 2.0 allows for one call

data/lib/ddex/version.rb

@@ -1,3 +1,3 @@
 module DDEX
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/rack/ddex.rb

@@ -0,0 +1,23 @@
+require "rack"
+require "json"
+require "ddex"
+
+module Rack
+  class DDEX
+    HEADERS = {"Content-Type" => "application/json"}.freeze
+
+    def call(env)
+      begin
+        obj  = ::DDEX.read(env["rack.input"])
+        json = JSON.dump(obj.to_hash)
+
+        [200, HEADERS.merge("Content-Length" => Rack::Utils.bytesize(json)), [json]]
+      rescue => e
+        code = e.is_a?(::DDEX::DDEXError) ? 400 : 500
+        json = JSON.dump(:error => e.message)
+
+        [code, HEADERS, [json]]
+      end
+    end
+  end
+end

data/spec/ern_spec.rb

@@ -83,7 +83,7 @@ describe DDEX::ERN do
 
   describe ".read" do
     describe "MessageSchemaVersionId detection" do
-      %w[/ern/35 ern/35/ //ern/35//].each do |v|
+      %w[/ern/35 ern/35/ //ern/35// 3.5].each do |v|
         it "parses #{v} as ERN 3.5" do
           doc = load_fixture("ern/35/instance1")
           doc.root["MessageSchemaVersionId"] = v

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddex
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Skye Shaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -87,7 +87,11 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- README.rdoc
+- lib/ddex.rb
 - lib/ddex/element.rb
+- lib/ddex/ern.rb
+- lib/ddex/ern/v33.rb
 - lib/ddex/ern/v33/catalog_item.rb
 - lib/ddex/ern/v33/catalog_list_message.rb
 - lib/ddex/ern/v33/catalog_release_reference_list.rb
@@ -145,7 +149,7 @@ files:
 - lib/ddex/ern/v33/user_defined_resource_details_by_territory.rb
 - lib/ddex/ern/v33/video.rb
 - lib/ddex/ern/v33/video_details_by_territory.rb
-- lib/ddex/ern/v33.rb
+- lib/ddex/ern/v34.rb
 - lib/ddex/ern/v34/catalog_item.rb
 - lib/ddex/ern/v34/catalog_list_message.rb
 - lib/ddex/ern/v34/catalog_release_reference_list.rb
@@ -204,7 +208,7 @@ files:
 - lib/ddex/ern/v34/video.rb
 - lib/ddex/ern/v34/video_details_by_territory.rb
 - lib/ddex/ern/v34/web_policy.rb
-- lib/ddex/ern/v34.rb
+- lib/ddex/ern/v341.rb
 - lib/ddex/ern/v341/catalog_item.rb
 - lib/ddex/ern/v341/catalog_list_message.rb
 - lib/ddex/ern/v341/catalog_release_reference_list.rb
@@ -263,7 +267,7 @@ files:
 - lib/ddex/ern/v341/video.rb
 - lib/ddex/ern/v341/video_details_by_territory.rb
 - lib/ddex/ern/v341/web_policy.rb
-- lib/ddex/ern/v341.rb
+- lib/ddex/ern/v35.rb
 - lib/ddex/ern/v35/catalog_item.rb
 - lib/ddex/ern/v35/catalog_list_message.rb
 - lib/ddex/ern/v35/catalog_release_reference_list.rb
@@ -324,7 +328,7 @@ files:
 - lib/ddex/ern/v35/video.rb
 - lib/ddex/ern/v35/video_details_by_territory.rb
 - lib/ddex/ern/v35/web_policy.rb
-- lib/ddex/ern/v35.rb
+- lib/ddex/ern/v351.rb
 - lib/ddex/ern/v351/catalog_item.rb
 - lib/ddex/ern/v351/catalog_list_message.rb
 - lib/ddex/ern/v351/catalog_release_reference_list.rb
@@ -385,7 +389,7 @@ files:
 - lib/ddex/ern/v351/video.rb
 - lib/ddex/ern/v351/video_details_by_territory.rb
 - lib/ddex/ern/v351/web_policy.rb
-- lib/ddex/ern/v351.rb
+- lib/ddex/ern/v36.rb
 - lib/ddex/ern/v36/administrating_record_company.rb
 - lib/ddex/ern/v36/artist.rb
 - lib/ddex/ern/v36/artist_delegated_usage_rights.rb
@@ -593,7 +597,7 @@ files:
 - lib/ddex/ern/v36/web_page.rb
 - lib/ddex/ern/v36/web_policy.rb
 - lib/ddex/ern/v36/work_list.rb
-- lib/ddex/ern/v36.rb
+- lib/ddex/ern/v37.rb
 - lib/ddex/ern/v37/administrating_record_company.rb
 - lib/ddex/ern/v37/all_territory_code.rb
 - lib/ddex/ern/v37/artist.rb
@@ -803,8 +807,6 @@ files:
 - lib/ddex/ern/v37/web_page.rb
 - lib/ddex/ern/v37/web_policy.rb
 - lib/ddex/ern/v37/work_list.rb
-- lib/ddex/ern/v37.rb
-- lib/ddex/ern.rb
 - lib/ddex/v20110630/ddexc/additional_information.rb
 - lib/ddex/v20110630/ddexc/administrating_record_company.rb
 - lib/ddex/v20110630/ddexc/amount_by_use_and_distribution_channel_type.rb
@@ -1849,7 +1851,7 @@ files:
 - lib/ddex/v20121219/ddexc/work_list.rb
 - lib/ddex/v20121219/ddexc/ws_message_status.rb
 - lib/ddex/version.rb
-- lib/ddex.rb
+- lib/rack/ddex.rb
 - spec/element_spec.rb
 - spec/ern/341_spec.rb~
 - spec/ern/34_spec.rb~
@@ -1871,7 +1873,6 @@ files:
 - spec/fixtures/ern36.xml~
 - spec/spec_helper.rb
 - spec/support/ddex_element.rb
-- README.rdoc
 homepage: http://github.com/sshaw/ddex
 licenses:
 - MIT
@@ -1892,7 +1893,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: DDEX metadata serialization