bcs-interrogator 0.0.2 → 0.0.6

data/lib/brewery_control_system/api/device.rb

@@ -0,0 +1,8 @@
+class NRB::BreweryControlSystem::API
+  class Device < Struct.new(:name, :type, :version, :build)
+    # build    string
+    # name     string
+    # type     string
+    # version  string
+  end
+end

data/lib/brewery_control_system/api/server_version.rb

@@ -0,0 +1,7 @@
+class NRB::BreweryControlSystem::API
+  module ServerVersion
+    def server_version(headers)
+      @server_version ||= headers["server"].sub(/^BCS\s+\/?(.+)\s+\(http:\/\/www\.embeddedcc\.com\)$/, '\1')
+    end
+  end
+end

data/lib/brewery_control_system/api/version_check.rb

@@ -0,0 +1,26 @@
+class NRB::BreweryControlSystem::API
+  class VersionCheck < Faraday::Response::Middleware
+
+    extend NRB::BreweryControlSystem::Middleware::Registration
+    include NRB::BreweryControlSystem::API::ServerVersion
+
+    attr_reader :required_version
+
+    def initialize(app=nil,version=nil)
+      raise ArgumentError.new("Must supply an api version to compare against") if version.nil?
+      super app
+      @required_version = version
+    end
+
+
+    def on_complete(env)
+      remote_version = server_version env[:response_headers]
+      if remote_version != required_version
+        warn "BCS Firmware version (#{remote_version}) does not match API version (#{required_version})."
+      end
+    end
+
+    register_middleware
+
+  end
+end

data/lib/brewery_control_system/http_service.rb

@@ -0,0 +1,27 @@
+require 'faraday-http-cache'
+class NRB::BreweryControlSystem
+  class HTTPService
+
+    autoload :UserAgent, 'brewery_control_system/http_service/user_agent'
+
+    class << self
+
+      attr_writer :default_adapter
+
+      def default_adapter; @default_adapter ||= Faraday.default_adapter; end
+
+
+      def default_service(cache_store: nil, options: nil, url: nil, &block)
+        Faraday.new url, options do |b|
+          b.use :http_cache, store: cache_store
+#          b.response :raise_error
+          yield b if block_given?
+          b.use UserAgent
+          b.adapter default_adapter
+        end
+      end
+
+    end
+
+  end
+end

data/lib/brewery_control_system/http_service/user_agent.rb

@@ -0,0 +1,33 @@
+module NRB; class BreweryControlSystem
+  class HTTPService::UserAgent
+
+    NAME = 'BCS Interrogator'.freeze
+    URL = 'https://github.com/NewRepublicBrewing/BCS-Interrogator'.freeze
+
+
+    def agent
+      @agent ||= "#{name} #{version} (#{url})".freeze
+    end
+
+
+    def call(env)
+      env[:request_headers]["User-Agent"] = agent
+      @app.call(env).on_complete { }
+    end
+
+
+    def initialize(app)
+      @app = app
+    end
+
+
+    def name; NAME; end
+
+
+    def url; URL; end
+
+
+    def version; NRB::BreweryControlSystem.version; end
+
+  end
+end; end

data/lib/brewery_control_system/input.rb

@@ -0,0 +1,4 @@
+class NRB::BreweryControlSystem
+  class Input < Struct.new(:id, :name, :state)
+  end
+end

data/lib/brewery_control_system/middleware.rb

@@ -0,0 +1,5 @@
+class NRB::BreweryControlSystem
+  module Middleware
+    autoload :Registration, 'brewery_control_system/middleware/registration'
+  end
+end

data/lib/brewery_control_system/middleware/registration.rb

@@ -0,0 +1,18 @@
+module NRB::BreweryControlSystem::Middleware
+  module Registration
+
+    def register_middleware(*args)
+      if Faraday::Response.respond_to? :register_middleware
+        if args.empty?
+          Faraday::Response.register_middleware self => self
+        else
+          Faraday::Response.register_middleware *args
+        end
+      else
+        warn "Can't register #{self.class.name} as middleware"
+      end
+
+    end
+
+  end
+end

data/lib/brewery_control_system/output.rb

@@ -0,0 +1,4 @@
+class NRB::BreweryControlSystem
+  class Input < Struct.new(:id, :name, :state)
+  end
+end

data/lib/brewery_control_system/temperature_probe.rb

@@ -0,0 +1,4 @@
+class NRB::BreweryControlSystem
+  class TemperatureProbe < Struct.new(:name, :temp, :setpoint, :resistance, :enabled, :coefficients)
+  end
+end

data/lib/brewery_control_system/version.rb

@@ -0,0 +1,6 @@
+module NRB
+  class BreweryControlSystem
+    VERSION = '0.0.6'.freeze
+    def self.version; VERSION; end
+  end
+end

data/spec/spec_helper.rb

@@ -1,2 +1,7 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'bcs_interrogator'
+require 'brewery_control_system'
+
+RSpec.configure do |config|
+  config.order = :random
+end
+

metadata

@@ -1,112 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: bcs-interrogator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Dean Brundage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: NRB_http_service
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 description: Embedded Control Concepts Brewery Control System interrogator
 email:
 - dean@newrepublicbrewing.com
@@ -116,43 +75,52 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/bcs_interrogator.rb
-- lib/bcs_interrogator/api.rb
-- lib/bcs_interrogator/api/endpoint.rb
-- lib/bcs_interrogator/api/response.rb
-- lib/bcs_interrogator/api/sysname.rb
-- lib/bcs_interrogator/api/ultemp.rb
-- lib/bcs_interrogator/entity.rb
-- lib/bcs_interrogator/version.rb
+- lib/brewery_control_system.rb
+- lib/brewery_control_system/api.rb
+- lib/brewery_control_system/api/3.7.0/bcs_sys.rb
+- lib/brewery_control_system/api/3.7.0/device_endpoint.rb
+- lib/brewery_control_system/api/3.7.0/endpoint.rb
+- lib/brewery_control_system/api/3.7.0/setpoints.rb
+- lib/brewery_control_system/api/3.7.0/sysname.rb
+- lib/brewery_control_system/api/3.7.0/temperature_probe_names_endpoint.rb
+- lib/brewery_control_system/api/3.7.0/temperature_probes_endpoint.rb
+- lib/brewery_control_system/api/3.7.0/temps.rb
+- lib/brewery_control_system/api/3.7.0/ultemp.rb
+- lib/brewery_control_system/api/device.rb
+- lib/brewery_control_system/api/server_version.rb
+- lib/brewery_control_system/api/version_check.rb
+- lib/brewery_control_system/http_service.rb
+- lib/brewery_control_system/http_service/user_agent.rb
+- lib/brewery_control_system/input.rb
+- lib/brewery_control_system/middleware.rb
+- lib/brewery_control_system/middleware/registration.rb
+- lib/brewery_control_system/output.rb
+- lib/brewery_control_system/temperature_probe.rb
+- lib/brewery_control_system/version.rb
 - spec/spec_helper.rb
-- spec/cases/api_spec.rb
-- spec/cases/bcs_interrogator_spec.rb
 homepage: https://github.com/NewRepublicBrewing/BCS-Interrogator
-licenses: []
+licenses:
+- GPL-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: bcs-interrogator
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A gem to intorrogate EEC Brewery Control Systems
 test_files:
 - spec/spec_helper.rb
-- spec/cases/api_spec.rb
-- spec/cases/bcs_interrogator_spec.rb
-has_rdoc: 

data/lib/bcs_interrogator.rb

@@ -1,36 +0,0 @@
-gem 'NRB_http_service'
-
-module NRB
-
-  autoload :HTTPService, 'NRB_http_service'
-
-  class BCSInterrogator
-
-    autoload :API, 'bcs_interrogator/api'
-    autoload :Entity, 'bcs_interrogator/entity'
-
-    attr_reader :api, :last_update
-
-    def initialize(args={})
-      @api = API.new base_url: args[:base_url]
-    end
-
-    def input_names;      api.sysname.input_names;      end
-    def inputs;           api.ultemp.outputs;           end
-    def output_names;     api.sysname.output_names;     end
-    def outputs;          api.ultemp.outputs;           end
-    def temp_probe_names; api.sysname.temp_probe_names; end
-    def temps;            api.ultemp.temps;             end
-    def setpoints;        api.ultemp.setpoints;         end
-
-    def update(args={})
-      api.ultemp.api_call
-      if args[:deep]
-         api.sysname.api_call
-      end
-      @last_update = Time.now
-      true
-    end
-
-  end
-end

data/lib/bcs_interrogator/api.rb

@@ -1,46 +0,0 @@
-module NRB
-  class BCSInterrogator
-    class API
-
-      autoload :Endpoint, 'bcs_interrogator/api/endpoint'
-      autoload :Response, 'bcs_interrogator/api/response'
-      autoload :Sysname, 'bcs_interrogator/api/sysname'
-      autoload :Ultemp, 'bcs_interrogator/api/ultemp'
-
-      API_VERSION = 'BCS 3.7.0'  # Use NRB::BCSInterrogator::API.api_version instead
-
-      def self.api_version; API_VERSION; end
-
-
-      attr_reader :http_service, :base_url
-
-      def api_call(args,connection_opts={})
-        args[:response_class] ||= NRB::BCSInterrogator::API::Response
-        response = @http_service.new(args,connection_opts).make_request
-        if response.server_version &&
-           response.server_version != self.class.api_version
-          warn "Firmware version (#{response.server_version}) does not match API version (#{self.class.api_version})."
-        end
-        response
-      end
-
-
-      def initialize(args={})
-        @base_url = args.delete(:base_url)
-        raise ArgumentError.new("Please supply a :base_url") unless @base_url
-        @http_service = args.delete(:http_service) || NRB::HTTPService
-      end
-
-
-      def sysname; @sysname ||= Sysname.new api: self; end
-      def ultemp; @ultemp ||= Ultemp.new api: self; end
-
-    private
-
-      def endpoint_base
-        @base_url
-      end
-
-    end
-  end
-end