whipped-cream 0.0.1pre3 → 0.0.1pre4

data/README.md

@@ -1,7 +1,9 @@
-# whipped-cream
-[![Gem Version](https://badge.fury.io/rb/whipped-cream.png)](http://badge.fury.io/rb/whipped-cream)
-[![Build Status](https://travis-ci.org/justincampbell/whipped-cream.png?branch=master)](https://travis-ci.org/justincampbell/whipped-cream)
-[![Code Climate](https://codeclimate.com/github/justincampbell/whipped-cream.png)](https://codeclimate.com/github/justincampbell/whipped-cream)
+# ![Whipped Cream logo](header.png)
+
+> HTTP topping for [Raspberry Pi](http://www.raspberrypi.org)
+> [![Gem Version](https://badge.fury.io/rb/whipped-cream.png)](http://badge.fury.io/rb/whipped-cream)
+> [![Build Status](https://travis-ci.org/justincampbell/whipped-cream.png?branch=master)](https://travis-ci.org/justincampbell/whipped-cream)
+> [![Code Climate](https://codeclimate.com/github/justincampbell/whipped-cream.png)](https://codeclimate.com/github/justincampbell/whipped-cream)
 
 ## DSL
 

data/demo.rb

@@ -4,6 +4,8 @@ button "Open/Close", pin: 1
 
 sensor "Door", pin: 2, high: "Open", low: "Closed"
 
+switch "Light", pin: 3
+
 sensor "Ruby Version" do
   RUBY_VERSION
 end

data/lib/whipped-cream.rb

@@ -6,4 +6,5 @@ require 'whipped-cream/plugin'
 require 'whipped-cream/runner'
 require 'whipped-cream/sensor'
 require 'whipped-cream/server'
+require 'whipped-cream/switch'
 require 'whipped-cream/version'

data/lib/whipped-cream/builder.rb

@@ -56,5 +56,9 @@ module WhippedCream
     def sensor(name, options = {}, &block)
       plugin.controls << Sensor.new(name, options, &block)
     end
+
+    def switch(name, options = {})
+      plugin.controls << Switch.new(name, options)
+    end
   end
 end

data/lib/whipped-cream/pi_piper.rb

@@ -7,16 +7,18 @@ module PiPiper
     def initialize(options)
       @pin = options[:pin]
       @direction = options[:direction]
+
+      @value = 0
     end
 
     def on
-      @value = :on
+      @value = 1
 
       log "Pin #{pin} on"
     end
 
     def off
-      @value = :off
+      @value = 0
 
       log "Pin #{pin} off"
     end

data/lib/whipped-cream/runner.rb

@@ -36,6 +36,7 @@ module WhippedCream
     def configure
       configure_buttons
       configure_sensors
+      configure_switches
     end
 
     def configure_buttons
@@ -78,6 +79,18 @@ module WhippedCream
       end
     end
 
+    def configure_switches
+      plugin.switches.each do |switch|
+        create_pin switch, direction: :out
+
+        define_singleton_method switch.id do
+          pin = pins[switch.id]
+
+          pin.value == 1 ? pin.off : pin.on
+        end
+      end
+    end
+
     def create_pin(control, options = {})
       return unless control.pin
 

data/lib/whipped-cream/server.rb

@@ -46,6 +46,7 @@ module WhippedCream
 
     def build_routes
       build_button_routes
+      build_switch_routes
     end
 
     def build_button_routes
@@ -57,6 +58,15 @@ module WhippedCream
       end
     end
 
+    def build_switch_routes
+      plugin.switches.each do |switch|
+        web.get "/#{switch.id}" do
+          runner.send(switch.id)
+          redirect to('/')
+        end
+      end
+    end
+
     # A Sinatra application skeleton that is used to build up the web server
     # for this plugin.
     class Web < Sinatra::Application

data/lib/whipped-cream/switch.rb

@@ -0,0 +1,11 @@
+module WhippedCream
+  # A switch toggles a pin between on and off states
+  class Switch < Control
+    attr_reader :name, :pin
+
+    def initialize(name, options = {})
+      @name = name
+      @pin = options[:pin]
+    end
+  end
+end

data/lib/whipped-cream/version.rb

@@ -1,3 +1,3 @@
 module WhippedCream
-  VERSION = "0.0.1pre3"
+  VERSION = "0.0.1pre4"
 end

data/lib/whipped-cream/views/switch.erb

@@ -0,0 +1,7 @@
+<div class="item">
+  <h2><%= control.name %></h2>
+  <p><%= runner.pins[control.id].value.nonzero? ? "On" : "Off" %></p>
+  <form action="/<%= control.id %>" method="get">
+    <input type="submit" value="<%= runner.pins[control.id].value.nonzero? ? "Off" : "On" %>">
+  </form>
+</div>

data/spec/lib/whipped-cream/builder_spec.rb

@@ -136,4 +136,27 @@ describe WhippedCream::Builder do
       end
     end
   end
+
+  describe "#switch" do
+    subject { plugin.switches }
+
+    it { should be_empty }
+
+    context "with a switch" do
+      let(:plugin) {
+        described_class.build do
+          switch "Light", pin: 3
+        end
+      }
+
+      it "adds a switch" do
+        expect(plugin.switches).to have(1).item
+
+        switch = plugin.switches.first
+
+        expect(switch.name).to eq("Light")
+        expect(switch.pin).to eq(3)
+      end
+    end
+  end
 end

data/spec/lib/whipped-cream/runner_spec.rb

@@ -77,4 +77,32 @@ describe WhippedCream::Runner do
       end
     end
   end
+
+  context "with a switch" do
+    let(:plugin) {
+      WhippedCream::Plugin.build do
+        switch "Light", pin: 3
+      end
+    }
+
+    it "sets up that pin with direction: :out" do
+      pin = runner.pins[:light]
+
+      expect(pin).to be_a(PiPiper::Pin)
+      expect(pin.pin).to eq(3)
+      expect(pin.direction).to eq(:out)
+    end
+
+    it "defines a light method that switches the pin on and off" do
+      pin = runner.pins[:light]
+
+      expect(pin.value).to eq(0)
+      runner.light
+      expect(pin.value).to eq(1)
+      runner.light
+      expect(pin.value).to eq(0)
+      runner.light
+      expect(pin.value).to eq(1)
+    end
+  end
 end

data/spec/lib/whipped-cream/switch_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe WhippedCream::Switch do
+  subject(:switch) { described_class.new(name, pin: pin) }
+
+  let(:name) { "Light" }
+  let(:pin) { 3 }
+
+  its(:name) { should eq(name) }
+  its(:id) { should eq(:light) }
+  its(:type) { should eq(:switch) }
+  its(:pin) { should eq(3) }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whipped-cream
 version: !ruby/object:Gem::Version
-  version: 0.0.1pre3
+  version: 0.0.1pre4
   prerelease: 5
 platform: ruby
 authors:
@@ -192,6 +192,7 @@ files:
 - WELCOME
 - bin/whipped-cream
 - demo.rb
+- header.png
 - lib/whipped-cream.rb
 - lib/whipped-cream/builder.rb
 - lib/whipped-cream/button.rb
@@ -209,11 +210,14 @@ files:
 - lib/whipped-cream/runner.rb
 - lib/whipped-cream/sensor.rb
 - lib/whipped-cream/server.rb
+- lib/whipped-cream/switch.rb
 - lib/whipped-cream/version.rb
 - lib/whipped-cream/views/button.erb
 - lib/whipped-cream/views/index.erb
 - lib/whipped-cream/views/layout.erb
 - lib/whipped-cream/views/sensor.erb
+- lib/whipped-cream/views/switch.erb
+- logo.png
 - spec/lib/whipped-cream/builder_spec.rb
 - spec/lib/whipped-cream/button_spec.rb
 - spec/lib/whipped-cream/cli_spec.rb
@@ -222,6 +226,7 @@ files:
 - spec/lib/whipped-cream/runner_spec.rb
 - spec/lib/whipped-cream/sensor_spec.rb
 - spec/lib/whipped-cream/server_spec.rb
+- spec/lib/whipped-cream/switch_spec.rb
 - spec/lib/whipped-cream_spec.rb
 - spec/spec_helper.rb
 - whipped-cream.gemspec
@@ -262,5 +267,6 @@ test_files:
 - spec/lib/whipped-cream/runner_spec.rb
 - spec/lib/whipped-cream/sensor_spec.rb
 - spec/lib/whipped-cream/server_spec.rb
+- spec/lib/whipped-cream/switch_spec.rb
 - spec/lib/whipped-cream_spec.rb
 - spec/spec_helper.rb