dsx-dml 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 985e1ae81c22db93542c4c73d9d889c6e859f40a
-  data.tar.gz: 912e303900bc2b98fb45c97ac3b7af5bd32f1333
+  metadata.gz: 1c0267af52f6079d2061168946dfbfedf3fdb5d5
+  data.tar.gz: b667fcf06038eba5823c6d5c3fb27c226f4448ba
 SHA512:
-  metadata.gz: 3aea101507cd4b8bea450195093618bbd9a9c7cf8e89bf9f174d9bbfd3c36f84012670ddea1795783c3780d1447883dc597e7687fb8feabe1ed49b1b1ff2f2a5
-  data.tar.gz: 0b65ced27ae8560f9780f3bb8938476cc7ad19b41457cd170943ce508b06c9df47ded046928441811e2d4af0bad8fa5591b78834a3de372b9a56c1d0d3366f5b
+  metadata.gz: 30f256ae7964fb6409af0741443c40f567e6db6aa54672d297e851159aa65190f8976cb1869e5e8196c05ed8d044bf1ef2772c6793f63f943864a0448a218d13
+  data.tar.gz: 0f1c0aae389746b2d12f1eb7af8d761ca8c8c4a67df21924a8decbb369b60cdbc3913d54a0efd94d467b983498c7c26bbffe3b36452b268e1bf2e500bbddf8d1

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :test => :spec
+
+
+

data/dsx-dml.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.1"
   spec.add_development_dependency "rspec", "~> 2.14"
   
   spec.add_runtime_dependency "net-sftp", "~> 2.1"

data/lib/dsx/dml.rb

@@ -1,21 +1,24 @@
 require 'dsx/dml/version'
-require 'net/sftp'
-require 'securerandom'
-require 'tmpdir'
-require 'tempfile'
 
 module Dsx
   module Dml
     
     class Zone
 
-      def initialize(location_num, udf_field_num)
+      def initialize(location_num, udf_field_num, writer = false)
         @location_num = location_num
         @udf_field_num = udf_field_num
+        if(writer)
+          @writer = writer
+        end
       end
       
       def use(id_num)
-        return Changeset.new(self, id_num)
+        if(@writer)
+          return Changeset.new(self, id_num)
+        else
+          return Changeset.new(self, id_num, @writer)
+        end
       end
       
       def location_num
@@ -31,19 +34,26 @@ module Dsx
     
     class Changeset
     
-      def initialize(zone, id_num)
+      def initialize(zone, id_num, writer = false)
         @id_num = id_num
         @zone = zone
         @stack = []
+        if(writer)
+          @writer = writer
+        end
         start_command
       end
     
       def table(table_name)
         case table_name
-        when 'Cards' 
-            return Cards.new(self, table_name)
+        when :Cards
+            return CardsTable.new(self, table_name)
+        when :Names
+            return NamesTable.new(self, table_name)
+        when 'Cards'
+            return CardsTable.new(self, table_name)
         when 'Names'
-            return Names.new(self, table_name)
+            return NamesTable.new(self, table_name)
         else
             return Table.new(self, table_name)
         end
@@ -54,26 +64,34 @@ module Dsx
       def to_string
         @stack.join("\r")
       end
+      
+      def to_s
+        to_string
+      end
+      
+      def writer=(writer)
+        @writer = writer
+      end
         
-      # params: {address: server_address, user: user, password: password}
-      def net_sftp(params)
-        Net::SFTP::start(params[:address], params[:user], :password => params[:password]) do |sftp|
-          sftp.file.open("/^Imp_Bio5_#{Time.now.utc.to_i}_#{SecureRandom::hex(4)}.txt", 'w') do |file|
-            file.write to_string
-            
-          end
+      def writer
+        @writer
+      end
+    
+      def net_sftp(writer = false)
+        if (writer)
+            writer.net_sftp(to_string)
+        elsif (@writer)
+            @writer.net_sftp(to_string)
         end
         return self
       end
       
       # Alternative to Net::SFTP.
-      def curl(params)
-        Dir.mktmpdir do |tmpdir|
-          file = Tempfile.new(["^Imp_Bio5_#{Time.now.utc.to_i}_", '.txt'], tmpdir)
-          file.write to_string
-          file.close()
-          result = `curl -s -S -u #{params[:user]}:#{params[:password]} -T #{file.path} -w "okay\n" sftp://#{params[:address]}/`
-          file.unlink()
+      def curl(writer = false)
+        if (writer)
+            writer.curl(to_string)
+        elsif (@writer)
+            @writer.curl(to_string)
         end
         return self
       end
@@ -118,21 +136,25 @@ module Dsx
       def curl(params)
         @changeset.curl(params)
       end
+      
+      def queue(data)
+        fields(data)
+      end
         
-      def write(data)
+      def write(data={})
         fields(data)
         @changeset.stack << 'W'
         return self
       end
         
-      def update(data)
+      def update(data={})
         fields(data)
         @changeset.stack << 'U'
         return self
       end
         
       def delete
-        fields(data)
+        fields(data={})
         @changeset.stack << 'D'
         return self
       end
@@ -155,7 +177,7 @@ module Dsx
     end
     
     
-    class Cards < Table
+    class CardsTable < Table
       
       def relace_code(code)
         single('ReplaceCode', code)
@@ -182,7 +204,7 @@ module Dsx
       end
   
       def clear_all_acl
-        blank('ClearTempAcl')
+        blank('ClearAcl')
       end
   
       def clear_all_tmp_acl
@@ -196,7 +218,7 @@ module Dsx
     end
   
 
-    class Names < Table
+    class NamesTable < Table
       
       def dc
         @changeset.stack << 'DC'

data/lib/dsx/dml/version.rb

@@ -1,5 +1,5 @@
 module Dsx
   module Dml
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/dsx/operation.rb

@@ -0,0 +1,170 @@
+require 'dsx/dml/version'
+require 'dsx/dml'
+require 'dsx/writer'
+
+
+
+module Dsx
+  module Dml
+  
+    class Operation
+    
+        def initialize(details, writer = false)
+          initialize_details(details)
+          initialize_command(writer)
+          
+        end
+        
+        def last_type=(type)
+          @type = type
+        end
+          
+        def last_type
+          @type
+        end
+        
+        def reset_cards
+          table = @changeset.table(:Names)
+          table.dc
+          table.write
+          self
+        end
+        
+        def access_levels
+          return AccessLevelOp.new(self, @changeset)
+        end
+        
+        def access_levels=(args=false)
+          return self
+        end
+        
+        def linking_level=(level)
+          table = @changeset.table(:Cards)
+          table.write({Code: @identifier, Loc: @location_num, OLL: level})
+          self
+        end
+        
+        def tmp_access_levels
+          return TmpAccessLevelOp.new(self, @changeset)
+        end
+        
+        def identifier
+          @identifier
+        end
+        
+        def changeset
+          @changeset
+        end
+        
+        def to_s
+          @changeset.to_s
+        end
+        
+        private
+        
+        def initialize_command(writer=false)
+          @zone = (writer) ? Zone.new(@location_num, @udf_num, writer) : Zone.new(@location_num, @udf_num)
+          changeset = @zone.use(@identifier)
+          changeset.table(:Names).write(FName: @first_name, 
+                                         LName: @last_name, 
+                                         Company: @company)
+          changeset.table(:UDF).write(UdfNum: @udf_num,
+                                       UdfText: @identifier)
+          @changeset = changeset
+        end
+        
+        def initialize_details(details)
+           if( details.key?(:location_num) &&
+               details.key?(:udf_num) &&
+               details.key?(:first_name) &&
+               details.key?(:last_name) &&
+               details.key?(:company)&&
+               details.key?(:identifier) )
+            @location_num = details[:location_num]
+            @udf_num = details[:udf_num]
+            @first_name = details[:first_name]
+            @last_name = details[:last_name]
+            @company = details[:company]
+            @identifier = details[:identifier]
+          else
+            raise "Operation arguments missing"
+          end
+        end
+    end
+    
+    
+    class OpTemplate
+      def initialize(op, changeset)
+        @changeset = changeset
+        @op = op
+      end
+    end
+    
+    
+    class CardRelatedOp < OpTemplate
+      def initialize(op, changeset)
+        super(op, changeset)
+        @table = @changeset.table(:Cards)
+        @table.queue(Code: op.identifier)
+      end
+    end
+    
+    
+    class AccessLevelOp < CardRelatedOp
+      
+      def + (values)
+        values.each do |level|
+          @table.add_acl(level)
+        end
+        @table.write
+        @op
+      end
+      
+      def - (values)
+        values.each do |level|
+          @table.del_acl(level)
+        end
+        @table.write
+        @op
+      end
+      
+      def reset
+        @table.clear_all_acl
+        @table.write
+        @op
+      end
+    
+    end
+    
+    
+    class TmpAccessLevelOp < CardRelatedOp
+    
+      def + (values)
+        values.each do |level|
+          @table.add_tmp_acl(level)
+        end
+        @table.write
+        @op
+      end
+      
+      def - (values)
+        values.each do |level|
+          @table.del_tmp_acl(level)
+        end
+        @table.write
+        @op
+      end
+      
+      def reset
+        @table.clear_all_tmp_acl
+        @table.write
+        @op
+      end
+    
+    end
+
+    
+    
+  end
+end
+    

data/lib/dsx/writer.rb

@@ -0,0 +1,94 @@
+require 'dsx/dml/version'
+require 'net/sftp'
+require 'securerandom'
+require 'tmpdir'
+require 'tempfile'
+
+
+# @ Todo: any encrypt/decrypt functions
+
+module Dsx
+  module Dml
+  
+    class Writer
+    
+      def initialize(params)
+        if(params.key?(:address) && params.key?(:user) && params.key?(:password))
+          @address = params[:address]
+          @user = params[:user]
+          @password = encrypt(params[:password])
+          @doc_label = (params.key? :doc_label) ? params[:doc_label] : 'rb_dsx_dml'
+          
+          # @key = SecureRandom::uuid()
+          # @salt = SecureRandom::uuid()
+          # @vector = SecureRandom::uuid()
+          
+        else
+          raise 'Incomplete DSX credentials'
+        end
+      end
+      
+      # params: {address: server_address, user: user, password: password}
+      def net_sftp(string_or_object)
+        data = format(string_or_object)
+        Net::SFTP::start(@address, @user, :password => @password) do |sftp|
+          sftp.file.open("/^Imp_#{@doc_label}_#{Time.now.utc.to_i}_#{SecureRandom::hex(4)}.txt", 'w') do |file|
+            file.write data
+          end
+        end
+        
+        dynamic_return(string_or_object)
+      end
+      
+      # Alternative to Net::SFTP.
+      def curl(string_or_object)
+        data = format(string_or_object)
+        Dir.mktmpdir do |tmpdir|
+          file = Tempfile.new(["^Imp_#{@doc_label}_#{Time.now.utc.to_i}_", '.txt'], tmpdir)
+          file.write data
+          file.close()
+          result = `curl -s -S -u #{@user}:#{@password} -T #{file.path} -w "okay\n" sftp://#{@address}/`
+          file.unlink()
+        end
+        
+        dynamic_return(string_or_object)
+      end
+      
+      private
+      
+      def dynamic_return (string_or_object)
+        if (string_or_object.is_a? String)
+          return this
+        else
+          return string_or_object
+        end
+      end
+      
+      def format(string_or_object)
+        if(string_or_object.respond_to?(:to_s))
+          return string_or_object.to_s()
+        elsif(string_or_object.respond_to?(:to_string))
+          return string_or_object.to_string()
+        else
+          # Really most things will respond to to_s. Might need special casing, though.
+        end
+      end
+      
+      private
+      
+      def password
+        decrypt(@password)
+      end
+      
+      def encrypt(value)
+        return value
+      end
+      
+      def decrypt(value)
+        return value
+      end
+      
+    end
+      
+  end
+end

data/spec/dsx/dml_spec.rb

@@ -1,45 +1,94 @@
 require 'dsx/dml'
+require 'dsx/writer'
+require 'dsx/operation'
 require 'securerandom'
 
+def get_card_number
+  rand(10000000000..99999999999)
+end
+
+def get_name
+  'test_' + SecureRandom::hex(4)
+end
+
+def test_credentials
+  {address: '127.0.0.1', user: 'teset' , password: 'testing_password'}
+end
+
 describe Dsx::Dml do
-    describe "Creating a changset string" do
-        
-        name = 'test_' + SecureRandom::hex(4)
-        number = rand(10000000000..99999999999)
-        zone = Dsx::Dml::Zone.new(130, 2)
-        
-        changeset = zone.use(number)
-        
-        changeset.table('Names').write({
-            FName: name, 
-            LName: name + "_L",
-            Company: 'Bio5',
-            Visitor: '',
-            Trace: '',
-            Notes: ''
-        }).table('UDF').write({
-            UdfNum: 2,
-            UdfText: number
-        }).table('Cards').write({
-            Code: number,
-            PIN: 1234,
-            StartDate: '09/15/2013',
-            StopDate: '04/11/2023',
-            NumUses: 9999
-        })
-        
-        changeset_string = changeset.to_string
-        
-        it "Should use DML compatible newlines" do
-            changeset_string.should include("\r")
-            changeset_string.should_not include("\n")
-        end
-        
-        it "Should have some properly formatted fields and values" do
-            changeset_string.should include("^#{name}^^^")
-            changeset_string.should include("^#{number}^^^")
-            changeset_string.should include("\rF UdfNum ^2^^^\r")
-        end
-        
+  describe "Creating a changset string" do
+    
+    name = get_name()
+    number = get_card_number()
+    zone = Dsx::Dml::Zone.new(130, 2)
+    
+    changeset = zone.use(number)
+    
+    changeset.table('Names').write({
+        FName: name, 
+        LName: name + "_L",
+        Company: 'Bio5',
+        Visitor: '',
+        Trace: '',
+        Notes: ''
+    }).table('UDF').write({
+        UdfNum: 2,
+        UdfText: number
+    }).table('Cards').write({
+        Code: number,
+        PIN: 1234,
+        StartDate: '09/15/2013',
+        StopDate: '04/11/2023',
+        NumUses: 9999
+    })
+    
+    changeset_string = changeset.to_string
+    
+    it "Should use DML compatible newlines" do
+      changeset_string.should include("\r")
+      changeset_string.should_not include("\n")
+    end
+    
+    it "Should have some properly formatted fields and values" do
+      changeset_string.should include("^#{name}^^^")
+      changeset_string.should include("^#{number}^^^")
+      changeset_string.should include("\rF UdfNum ^2^^^\r")
+    end
+    
+    # writer = Dsx::Dml::Writer.new(test_credentials)
+    # writer.net_sftp(changeset)
+    
+  end
+  
+  describe "Using an operation" do
+    name = get_name()
+    op = Dsx::Dml::Operation.new(location_num:  130, 
+                                 udf_num:       2, 
+                                 first_name:    name, 
+                                 last_name:     name + '_L', 
+                                 company:       'Bio5', 
+                                 identifier:    get_card_number())
+    op.access_levels += ['BIO5 Test Level 1', 'BIO5 Test Level 2']
+    op.access_levels -= ['Master Access Level']
+    op.linking_level = 1
+
+    op_string = op.to_s
+    
+    it "Should use DML compatible newlines" do
+      op_string.should include("\r")
+      op_string.should_not include("\n")
+    end
+    
+    it "Should have access level commands" do
+      op_string.should include("\rF AddAcl ^BIO5 Test Level 1^^^\r")
+      op_string.should include("\rF AddAcl ^BIO5 Test Level 2^^^\r")
+      op_string.should include("\rF DelAcl ^Master Access Level^^^\r")
+      op_string.should include("\rF Loc ^130^^^\r")
+      op_string.should include("\rF OLL ^1^^^\r")
     end
+      
+    # writer = Dsx::Dml::Writer.new(test_credentials)
+    # writer.curl(op.changeset)
+    
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsx-dml
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - dgsan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +83,8 @@ files:
 - dsx-dml.gemspec
 - lib/dsx/dml.rb
 - lib/dsx/dml/version.rb
+- lib/dsx/operation.rb
+- lib/dsx/writer.rb
 - spec/dsx/dml_spec.rb
 homepage: https://github.com/dgsan/dsx-dml
 licenses: