cdl 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11b9f9bd0f96541bc25ac2abee5a14e864daed96
-  data.tar.gz: f1b358c1130e6e2437ed836d26fd4c4e3b7f8bc9
+  metadata.gz: 3e7d9e23c0b41ee7073bee72a67ce2a58cc71f08
+  data.tar.gz: 4ef74af708ccd424ff1f20282c968c332c8bddd5
 SHA512:
-  metadata.gz: a0d7a6ba0d1564906ab6dbdb8a4df47c98a9c7677813f209d99aa9522fc9958cd8c6f43ec33fdcdc08427f23e9e413055ee8b397ad984104e90c6780e08642cf
-  data.tar.gz: 88cd676d364d7c77e2679568f37e573650c9015eb8dbe0ab008a9c7c34192ea4958fd4fcdf2c2434b06eed1adf8fa52ad4f02908093e07ff3e4f2deac4a42e32
+  metadata.gz: a01688588205953dac78da46ec72aa9f4c3b0c38159ea6e46d3fb88d566024a2070563387984b397dfef521a576edaa1e41d2aab896aba4783dc51eacccbfdbe
+  data.tar.gz: 12ddc9167d03119ec4d6873ec14bbbfbbfa2ef571506ec6a250d6af5c6365d204cedc54e02f388714e368a7fa90824319dffcf036cb713d230ec8ec5a1b0d84d

data/fixtures/CDL_V1_092612.edl

@@ -1 +1 @@
-TITLE:   CDL CONFORM TEST_V1_092612 
+TITLE:   CDL CONFORM TEST_V1_092612 

data/lib/cdl.rb

@@ -1,11 +1,11 @@
-
 require_relative "cdl/version.rb"
 require_relative "cdl/edl.rb"
  
-cdl = Cdl::Edl.new("../fixtures/CDL_V1_092612.edl")
+# cdl = Cdl::Edl.new("fixtures/CDL_V1_092612.edl")
+
 # cdl.read_file
 # cdl.to_hash
-
 # cdl.slope
 # cdl.offset
 # cdl.power
+# cdl.sat

data/lib/cdl/edl.rb

@@ -2,7 +2,10 @@ module Cdl
 
 	COLORVALUE = /(-?\d{1,}\.\d{1,})\s(-?\d{1,}\.\d{1,})\s(-?\d{1,}\.\d{1,})/
 	VALUE = /\((-?\d{1}\.\d{1,}\s*-?\d{1}\.\d{1,}\s*-?\d{1}\.\d{1,})\)/
-	SOP = /#{VALUE}#{VALUE}#{VALUE}/
+	SAT = /\*ASC_SAT\s*(-?\d{1}\.\d{1,})/
+	SOP = /#{VALUE}#{VALUE}#{VALUE}\s*\r?/
+	TAPE = /^\d{1,}\s*(\w*)\s*/
+	CLIP = /^\*FROM CLIP NAME:\s*(\w*)\s*/
 
 	class Edl
 	
@@ -17,12 +20,17 @@ module Cdl
 
 		def to_hash
 			store = []
+			hash  = {}
 			read_file.each do |line|
-				store << {
-					:slope  => $1,
-					:offset => $2,
-					:power  => $3
-				} if line =~ SOP
+
+				store << hash = {
+					:slope  => $1, 
+					:offset => $2, 
+					:power  => $3 
+				}	if line =~ SOP
+
+				hash[:sat] = $1 if line =~ SAT
+
 			end
 			store
 		end
@@ -31,7 +39,6 @@ module Cdl
 			parse_rgb(:slope)
 		end
 
-
 		def offset
 			parse_rgb(:offset)
 		end
@@ -40,8 +47,20 @@ module Cdl
 			parse_rgb(:power)
 		end
 
+		def sat
+			parse(:sat)
+		end
+
 		private
 
+		def parse(attributes)
+			arr = []
+			to_hash.each do |i|
+				arr << i[attributes]
+			end
+			arr
+		end
+
 		def parse_rgb(attributes)
 			
 			red   = []
@@ -49,9 +68,9 @@ module Cdl
 			blue  = []
 
 			to_hash.each do |r|
-				red 	<< $1 if r[attributes] =~ COLORVALUE
-				green << $2 if r[attributes] =~ COLORVALUE
-				blue 	<< $3 if r[attributes] =~ COLORVALUE
+				red   << $1  if r[attributes] =~ COLORVALUE
+				green << $2  if r[attributes] =~ COLORVALUE
+				blue  << $3  if r[attributes] =~ COLORVALUE
 			end
 			
 			result = { :red => red, :green => green, :blue => blue } 

data/lib/cdl/version.rb

@@ -1,3 +1,3 @@
 module Cdl
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Nicolas Duval
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,9 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Color Decision List (ASC CDL) parser
 test_files: []
-has_rdoc: