sonycam 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ce94eb6c341f619ef65191b765a3a79bd86a241
-  data.tar.gz: ded56c7cc81ef457d55c4ba62a4dacc7f5065206
+  metadata.gz: 7d111ba16847fff6b8e6dae447b02ae9a9ec0fff
+  data.tar.gz: 89ff24db3ea892420a1bc52ae995b006b3e4fc3f
 SHA512:
-  metadata.gz: c0b1038851747875aa94fca082ec67701781a3921c70062bc5d1a267ffa3f410175352a1cae734f97c554051d5130eddd0a7ad6ff19062e0c0818f7f5831b712
-  data.tar.gz: 654765f80967c3c7bf0fdba9c0e0072f215675de383f13114c08a492698b5c74e26f9d75bd502d72583b7aeb5b4727f64eb5b6580e96b3fe49418a3323f58e77
+  metadata.gz: 30f57b2cde854524aadd0db65ea03219a02a72f996882ac85f9eaa79a43a285e3515fef22d9e6d026707e5613102c95ac34b8fd69662b5d7b409d89440d9be79
+  data.tar.gz: bb3c910f893622909a3c30ed83ff27b447563bdeefbedb5ef3a25839f32bfdeec0be8438a7328ca1536517873638df96caa35b34f785cea255ffe8e4a0b566c1

data/lib/sonycam/api.rb

@@ -14,7 +14,7 @@ module Sonycam
       ret = JSON.parse(@http.request_post(@uri.path, json).body)
       if ret['error']
         error_code, error_message = ret['error']
-        raise Sonycam::Error.new_from_code(error_code), error_message
+        raise Sonycam::Error.make(error_code), error_message
       else
         ret['result']
       end

data/lib/sonycam/device_description.rb

@@ -21,12 +21,12 @@ module Sonycam
       # Hush, it's a secret, don't tell anyone.
       if @camera_name == 'DSC-RX100M2'
         url = @api_url_hash[type].sub('sony', 'camera')
-        puts "DSC-RX100M2 detected, API URL \"#{url}\" was used insteadly."
+        puts "DSC-RX100M2 detected, API URL \"#{url}\" is used insteadly."
         return url
       end
 
       if action_list_url = @api_url_hash[type] then "#{action_list_url}/#{type}"
-      else raise "Can't not find service type \"#{type}\"."
+      else raise "Can not find service type \"#{type}\"."
       end
     end
   end

data/lib/sonycam/error.rb

@@ -34,7 +34,7 @@ module Sonycam
       const_set error_name, Class.new(StandardError)
     end
 
-    def self.new_from_code code
+    def self.make code
       const_get(MAPPING[code])
     end
   end

data/lib/sonycam/liveview.rb

@@ -13,17 +13,17 @@ module Sonycam
           buf = ''.force_encoding('BINARY')
           commen_header = nil
           payload_header = nil
-            response.read_body do |chunk|
+          response.read_body do |chunk|
             buf += chunk
             until buf.empty?
               case state
               when :commen_header # 8 bytes
                 break if buf.size < 8
-                commen_header = buf.slice!(0, 8).unpack('H2CnN')
+                commen_header = buf.slice!(0, 8).unpack('aanN')
                 state = :payload_header
               when :payload_header # 128 bytes
                 break if buf.size < 128
-                payload_header = buf.slice!(0, 128).unpack('H8H6CH8CH*')
+                payload_header = buf.slice!(0, 128).unpack('a4H6Ca4aa*')
                 state = :payload_data
               when :payload_data
                 jpeg_data_size = payload_header[1].to_i(16)
@@ -34,7 +34,6 @@ module Sonycam
                 state = :commen_header
                 yield Packet.new(commen_header, payload_header, jpeg_data, padding_data)
               end # case state
-              # gets
             end # until buf.empty?
           end # response.read_body do |chunk|
         end # http.request request do |response|

data/lib/sonycam/packet.rb

@@ -3,26 +3,26 @@ module Sonycam
     def initialize commen_header, payload_header, jpeg_data, padding_data
       @packet = {
         commen_header: {
-          start_byte: commen_header[0], # hex, fixed "FF"
-          payload_type: commen_header[1], # int
-          sequence_number: commen_header[2], # int
-          time_stamp: commen_header[3] # int
+          start_byte: commen_header[0],          # hex, fixed "FF"
+          payload_type: commen_header[1],        # int
+          sequence_number: commen_header[2],     # int
+          time_stamp: commen_header[3]           # int
         },
         payload_header: {
-          star_code: payload_header[0], # hex, fixed "24356879"
-          jpeg_data_size: payload_header[1].to_i(16), # int
-          padding_size: payload_header[2], # int
-          reserved: payload_header[3], # hex
-          flag: payload_header[4], # int, fixed "00"
+          star_code: payload_header[0],          # hex, fixed "24356879"
+          jpeg_data_size: payload_header[1].hex, # int
+          padding_size: payload_header[2],       # int
+          reserved: payload_header[3],           # hex
+          flag: payload_header[4],               # int, fixed "00"
           reserved_2: payload_header[5]
-
         },
         payload_data: {
           jpeg_data: jpeg_data,
           padding_data: padding_data
-        },
+        }
       }
     end
+
     def [] key
       @packet[key]
     end

data/lib/sonycam/version.rb

@@ -1,3 +1,3 @@
 module Sonycam
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonycam
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Tony Jian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor