iptcr 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 801173393ff24fc468de4a0c0842f03f28058b4b
-  data.tar.gz: fceac79394ba9e6823b39228652e440a69a78415
+  metadata.gz: a41336d23d8fbd12a7106d88009508ae869357e7
+  data.tar.gz: ad2db1e2b64427ffafed283b9580fefa99524471
 SHA512:
-  metadata.gz: 038c87adeebe6b3047abfb4304145b2fca3344ccef31de92ff9ab1f93d68b5ca42a32199280a02bf8689fde9d464de544126a2f6ff384f97515c91b67c704e02
-  data.tar.gz: 612b8924a4456eb48d252be3f097dd10b75d5acb7d5b6943133691ea927178878eeb41ce72719c734fc9455f36f119c9b0fcceb2c9eeab9195b4e45b969354e8
+  metadata.gz: 1c514478623a9dd1c8f475de25ef93fbe03202b4275c09534bfa0c2885ae59b06bd486de529802521410e4855e709e8fc781b17184762f973e027fa3afdde710
+  data.tar.gz: d03b0e1117cdd200827a9dfa99a879950c4ea8b2b8562de065657cc098af7d4cc732cdc64c9ce7520ccbd08407bdc232e85d8bf2fcf52ce3244f4e09b3905c92

data/lib/iptcr.rb

@@ -1,13 +1,15 @@
 require "iptcr/version"
 
 module IPTCR
-  def self.parse(value, length: nil)
+  class Malformed < RuntimeError; end
+
+  def self.parse(value, length: nil, **kwargs)
     if value.is_a? String
       require "stringio"
       length ||= value.bytesize
-      IPTC.new(StringIO.new(value), length: length)
+      IPTC.new(StringIO.new(value), length: length, **kwargs)
     else
-      IPTC.new(value, length: length)
+      IPTC.new(value, length: length, **kwargs)
     end
   end
 

data/lib/iptcr/iptc.rb

@@ -2,8 +2,6 @@ require "iptcr"
 require "iptcr/records"
 
 module IPTCR
-  class Malformed < RuntimeError; end
-
   # # IPTC
   #
   # ## Notes
@@ -24,7 +22,8 @@ module IPTCR
     # IPTC IIM specifics the default encoding is ISO646/4873, which is roughly ASCII
     DEFAULT_ENCODING = Encoding::ASCII
 
-    def initialize(io, length:)
+    def initialize(io, length: nil, default_encoding: nil)
+      @encoding = default_encoding
       @fields = []
       read_fields(io, length: length)
     end
@@ -95,8 +94,10 @@ module IPTCR
         case field.value
         when "\x1b%G"
           @encoding = Encoding::UTF_8
+        when "\x1b\xe2\x80\xa2A"
+          @encoding = Encoding::ISO_8859_1 # Latin 1
         else
-          EXIFR.logger.warn { "IPTC: Unknown codec character set: #{field.value.inspect}" }
+          warn "IPTC: Unknown encoding: #{field.value.inspect}, using default #{encoding}"
         end
       end
 
@@ -176,10 +177,10 @@ module IPTCR
         when "string"
           # Record number 1 is always the default encoding
           if record_number == 1
-            @data.force_encoding(DEFAULT_ENCODING)
+            @data.force_encoding(DEFAULT_ENCODING) unless @data.nil?
           # Records 2-6 and 8 respect tagged encoding
           elsif (2..6).include?(record_number) || record_number == 8
-            @data.force_encoding(encoding)
+            @data.force_encoding(encoding) unless @data.nil?
           # Other behaviour is undefined
           else
             @data

data/lib/iptcr/version.rb

@@ -1,3 +1,3 @@
 module IPTCR
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/iptc_test.rb

@@ -83,6 +83,12 @@ class IPTCTest < Minitest::Test
     assert_equal("☃".force_encoding("UTF-8"), iptc["ObjectName"])
   end
 
+  def test_iptc_default_encoding_string
+    iptc = IPTCR.parse("\x1c\x02\x05\x00\x01\x80".b, default_encoding: "windows-1252")
+    assert_equal(Encoding::Windows_1252, iptc["ObjectName"].encoding)
+    assert_equal("€", iptc["ObjectName"].encode("utf-8"))
+  end
+
   def test_iptc_string_list
     iptc = IPTCR.parse("\x1c\x01\x05\x00\x05Hello\x1c\x01\x05\x00\x05World".b)
     assert_equal(2, iptc.fields.size)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iptcr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Samuel Cochran
@@ -28,7 +28,7 @@ cert_chain:
   52G9HuhbVSTgE/I10H9qZBOE3qdP8ka/Fk0PUrux/DuUanNZgSKJokrQvRA4H9Au
   WpPA7HJYV6msWQiukoBEhfQ2l6Fl2HUwntvX3MCcFNHeJJ5ETERp9alo88E=
   -----END CERTIFICATE-----
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,11 +107,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Parse IPTC data
 test_files:
 - test/iptc_test.rb
 - test/test_helper.rb
-has_rdoc: