frappuccino 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aa6c347af81d9a074803f7be38c360db41adee4
-  data.tar.gz: 49da3f4765330f9ad73de449aa3080454f9f49e2
+  metadata.gz: 0b25e50a7580dd5fd3e7e286b1ad5b5fd3b22f6f
+  data.tar.gz: e13f31447678e30538171e18a469c3df4a312a9d
 SHA512:
-  metadata.gz: 68c592a44ab4e948adfa4b8bb4214438cf3282cd9a3ce6047c436ad19471fa440b7d9703afc3fd0d9da386cc2873cc9091b7d80abdc8436973df00d0a79b4c40
-  data.tar.gz: cf1dc7f6d0394e3587714d668ab2a9aa304089ab4c5c239b7bbb8f406818ead40e6aa35dcc6c81c07ee236294090911018531eb3f96aa4484b5a0d902f420a04
+  metadata.gz: 7f24114bd056dee3e4948746618e3d7ef73717ba1b9338ef507899dfbd8ef8208a8971006067373911003b484d7e9e1e970b7907fe79e728f19012244b3424a3
+  data.tar.gz: 9dc5faa55739df468f2ee0bc67e7bdb0d6bf40a566347d55b679ed2ba7f5333978d8fedeef156afef1ca199301f499686bd0e7b4ffbf11c27d0d8c1f3223040a

data/.travis.yml

@@ -1,8 +1,14 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 1.9.2
   - 1.9.3
-  - rbx-nightly-19mode
+  - 2.0.0
+  - 2.1.0
   - jruby-19mode
-allow_failures:
-  - rvm: rbx-nightly-19mode
+  - rbx-2
+  - ruby-head
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/README.md

@@ -9,22 +9,23 @@ Functional Reactive Programming for Ruby.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'frappuccino', github: "steveklabnik/frappuccino"
+gem 'frappuccino'
 ```
 
-(I'm hoping that @yoka will give me the gem name, until then, you
-must install from GitHub.)
-
 And then execute:
 
-    $ bundle
+``` sh
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ git clone https://github.com/steveklabnik/frappuccino
-    $ cd frappuccino
-    $ bundle
-    $ rake install
+``` sh
+$ git clone https://github.com/steveklabnik/frappuccino
+$ cd frappuccino
+$ bundle
+$ rake install
+```
 
 ## Usage
 
@@ -77,7 +78,11 @@ end
 You can combine two streams together:
 
 ```ruby
-merged_stream = Frappuccino::Stream.merge(stream_one, stream_two)
+merged_stream = stream_one.merge(stream_two)
+
+# or
+
+merged_stream = Frappuccino::Stream.merge(one_stream , other_stream)
 
 # or
 

data/lib/frappuccino.rb

@@ -1,3 +1,19 @@
 require "frappuccino/version"
 require "frappuccino/stream"
 require "frappuccino/property"
+
+module Frappuccino
+  def self.lift(value)
+    Property.new(value)
+  end
+end
+
+class Object
+  def method_missing(method, *args, &block)
+    if Frappuccino::Property.method_defined?(method)
+      Frappuccino.lift(self).public_send(method, *args, &block)
+    else
+      super(method, *args, &block)
+    end
+  end
+end

data/lib/frappuccino/property.rb

@@ -1,16 +1,44 @@
 module Frappuccino
   class Property
-    def initialize(zero, stream)
+  end
+end
+
+require 'frappuccino/property/map_property'
+require 'frappuccino/property/until_property'
+require 'frappuccino/property/toggle_property'
+
+module Frappuccino
+  class Property
+    def initialize(zero, stream = nil)
       @value = zero
-      stream.add_observer(self)
+
+      if stream
+        stream.on_value do |value|
+          @value = value
+        end
+      end
     end
 
     def now
       @value
     end
 
-    def update(value)
-      @value = value
+    def sample(stream)
+      stream.map do
+        self.now
+      end
+    end
+
+    def until(stream, property)
+      UntilProperty.new(self, stream, property)
+    end
+
+    def toggle(stream, property)
+      ToggleProperty.new(self, stream, property)
+    end
+
+    def map(&blk)
+      MapProperty.new(self, &blk)
     end
   end
 end

data/lib/frappuccino/property/map_property.rb

@@ -0,0 +1,12 @@
+module Frappuccino
+  class MapProperty < Property
+    def initialize(property, &block)
+      @property = property
+      @block = block
+    end
+
+    def now
+      @block.call(@property.now)
+    end
+  end
+end

data/lib/frappuccino/property/toggle_property.rb

@@ -0,0 +1,16 @@
+module Frappuccino
+  class ToggleProperty < Property
+    def initialize(first, switcher, second)
+      @properties = [first, second]
+      @current_index = 0
+
+      switcher.on_value do
+        @current_index = (@current_index + 1) % 2
+      end
+    end
+
+    def now
+      @properties[@current_index].now
+    end
+  end
+end

data/lib/frappuccino/property/until_property.rb

@@ -0,0 +1,17 @@
+module Frappuccino
+  class UntilProperty < Property
+    def initialize(first, switcher, second)
+      @first = first
+      @second = second
+      @current_prop = @first
+
+      switcher.on_value do |value|
+        @current_prop = @second
+      end
+    end
+
+    def now
+      @current_prop.now
+    end
+  end
+end

data/lib/frappuccino/stream.rb

@@ -90,6 +90,10 @@ module Frappuccino
       callbacks << blk
     end
 
+    def merge(another_stream)
+      Stream.new(self, another_stream)
+    end
+
     def self.merge(stream_one, stream_two)
       new(stream_one, stream_two)
     end

data/lib/frappuccino/version.rb

@@ -1,3 +1,3 @@
 module Frappuccino
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/lift_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+describe "lift" do
+  it "returns a Property of the value" do
+    prop = Frappuccino.lift("Property")
+    assert_equal("Property", prop.now)
+  end
+
+  it "is automatically applied to any Object" do
+    assert_equal("Property", "Property".now)
+  end
+end

data/test/map_test.rb

@@ -29,7 +29,7 @@ describe "map" do
     stream_one = Frappuccino::Stream.new(plus_button)
     stream_two = Frappuccino::Stream.new(minus_button)
 
-    merged_stream = Frappuccino::Stream.merge(stream_one, stream_two)
+    merged_stream = stream_one.merge(stream_two)
     mapped_stream = to_array(merged_stream.map(:+ => 1, :- => -1, :default => 0))
 
     assert_equal [], mapped_stream
@@ -48,7 +48,7 @@ describe "map" do
     stream_one = Frappuccino::Stream.new(plus_button)
     stream_two = Frappuccino::Stream.new(minus_button)
 
-    merged_stream = Frappuccino::Stream.merge(stream_one, stream_two)
+    merged_stream = stream_one.merge(stream_two)
     mapped_stream = to_array(merged_stream.map(:default => 1))
 
     assert_equal [], mapped_stream

data/test/merge_test.rb

@@ -7,7 +7,7 @@ describe "merging steams" do
 
     stream_one = Frappuccino::Stream.new(button_one)
     stream_two = Frappuccino::Stream.new(button_two)
-    merged_stream = to_array(Frappuccino::Stream.merge(stream_one, stream_two))
+    merged_stream = to_array(stream_one.merge(stream_two))
 
     button_one.push
     button_two.push
@@ -21,8 +21,7 @@ describe "merging steams" do
 
     stream_one = Frappuccino::Stream.new(plus_button)
     stream_two = Frappuccino::Stream.new(minus_button)
-
-    merged_stream = Frappuccino::Stream.merge(stream_one, stream_two)
+    merged_stream = stream_one.merge(stream_two)
     counter = merged_stream
               .map do |event|
                 case event
@@ -50,4 +49,33 @@ describe "merging steams" do
     4.times { plus_button.push }
     assert_equal 2, counter.now
   end
+  
+  it "works if the callee has a different constructor from Stream" do
+    button_one = Button.new
+    button_two = Button.new
+
+    stream_one = Frappuccino::Stream.new(button_one).map { 0 }
+    stream_two = Frappuccino::Stream.new(button_two)
+    
+    # This would explode if the merge was calling
+    # self.class.new rather than Stream.new
+    stream_one.merge(stream_two)
+  end
 end
+
+
+describe "merging stream with Frappuccino::Stream#merge" do
+  it "produces one stream with both sets of events" do
+    button_one = Button.new
+    button_two = Button.new
+
+    stream_one = Frappuccino::Stream.new(button_one)
+    stream_two = Frappuccino::Stream.new(button_two)
+    merged_stream = to_array(Frappuccino::Stream.merge(stream_one, stream_two))
+
+    button_one.push
+    button_two.push
+
+    assert_equal 2, merged_stream.length
+  end
+end

data/test/mvp_test.rb

@@ -10,13 +10,14 @@ describe "MVP interaction" do
     counter = stream
               .map {|event| event == :pushed ? 1 : 0 }
               .inject(0) {|sum, n| sum + n }
+              .map { |val| val.to_s }
 
-    assert_equal 0, counter.now
+    assert_equal "0", counter.now
 
     3.times { button.push }
-    assert_equal 3, counter.now
+    assert_equal "3", counter.now
 
     button.push
-    assert_equal 4, counter.now
+    assert_equal "4", counter.now
   end
 end

data/test/property_test.rb

@@ -19,4 +19,43 @@ describe "Property" do
       end
     end
   end
+
+  describe "#sample" do
+    before do
+      @counter = CounterButton.new(1)
+      stream = Frappuccino::Stream.new(@counter)
+      prop = Frappuccino::Property.new(0, stream)
+
+      @sampler = Button.new
+      @samples = to_array(prop.sample(Frappuccino::Stream.new(@sampler)))
+    end
+
+    it "has no occurrences initally" do
+      assert_equal @samples, []
+    end
+
+    it "samples the Property when the passed Stream occurs" do
+      @sampler.push
+      assert_equal @samples, [0]
+
+      @counter.push
+      @sampler.push
+      assert_equal @samples, [0, 1]
+    end
+  end
+
+  describe "#map" do
+    it "creates a Property with a mapped value of the original" do
+      button = CounterButton.new(1)
+      stream = Frappuccino::Stream.new(button)
+      prop = Frappuccino::Property.new("0", stream).map do |v|
+        v.to_s
+      end
+
+      5.times do |i|
+        assert_equal i.to_s, prop.now
+        button.push
+      end
+    end
+  end
 end

data/test/test_helper.rb

@@ -19,6 +19,10 @@ def to_array(stream)
   pushed
 end
 
+def to_prop(ini, stream)
+  Frappuccino::Property.new(ini, stream)
+end
+
 class Button
   def push
     emit(:pushed)

data/test/toggle_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+describe "toggle" do
+  it "toggles between two Properties on stream occurrences" do
+    switch_button = Button.new
+    plus_button = PlusOneButton.new
+    minus_button = MinusOneButton.new
+
+    switch = Frappuccino::Stream.new(switch_button)
+    plus = to_prop(:+, Frappuccino::Stream.new(plus_button))
+    minus = to_prop(:-, Frappuccino::Stream.new(minus_button))
+
+    prop = plus.toggle(switch, minus)
+    assert_equal(:+, prop.now)
+
+    switch_button.push
+    assert_equal(:-, prop.now)
+
+    switch_button.push
+    assert_equal(:+, prop.now)
+  end
+end

data/test/until_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+describe "until" do
+  it "switches the Property on the Stream occurring" do
+    switch_button = Button.new
+    plus_button = PlusOneButton.new
+    minus_button = MinusOneButton.new
+
+    switch = Frappuccino::Stream.new(switch_button)
+    plus = to_prop(:notplus, Frappuccino::Stream.new(plus_button))
+    minus = to_prop(:notminus, Frappuccino::Stream.new(minus_button))
+
+    prop = plus.until(switch, minus)
+    assert_equal(:notplus, prop.now)
+
+    plus_button.push
+    assert_equal(:+, prop.now)
+
+    minus_button.push
+    switch_button.push
+    assert_equal(:-, prop.now)
+  end
+end

data/test/zip_test.rb

@@ -27,7 +27,7 @@ describe "zip" do
 
     zipped_stream = to_array(stream1.zip(stream2))
 
-    2.times do |i|
+    2.times do
       button1.push
       assert_equal [], zipped_stream, "zipped stream occurred too early"
     end
@@ -49,7 +49,7 @@ describe "zip" do
 
     zipped_stream = to_array(stream1.zip(stream2))
 
-    2.times do |i|
+    2.times do
       button2.push
       assert_equal [], zipped_stream, "zipped stream occurred too early"
     end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: frappuccino
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A library to do Functional Reactive Programming in Ruby.
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -54,6 +54,9 @@ files:
 - frappuccino.gemspec
 - lib/frappuccino.rb
 - lib/frappuccino/property.rb
+- lib/frappuccino/property/map_property.rb
+- lib/frappuccino/property/toggle_property.rb
+- lib/frappuccino/property/until_property.rb
 - lib/frappuccino/source.rb
 - lib/frappuccino/stream.rb
 - lib/frappuccino/stream/drop.rb
@@ -64,6 +67,7 @@ files:
 - lib/frappuccino/stream/zip.rb
 - lib/frappuccino/version.rb
 - test/drop_test.rb
+- test/lift_test.rb
 - test/map_test.rb
 - test/merge_test.rb
 - test/mvp_test.rb
@@ -76,6 +80,8 @@ files:
 - test/stream_test.rb
 - test/take_test.rb
 - test/test_helper.rb
+- test/toggle_test.rb
+- test/until_test.rb
 - test/zip_test.rb
 homepage: https://github.com/steveklabnik/frappuccino
 licenses:
@@ -87,22 +93,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Functional Reactive Programming in Ruby.
 test_files:
 - test/drop_test.rb
+- test/lift_test.rb
 - test/map_test.rb
 - test/merge_test.rb
 - test/mvp_test.rb
@@ -115,5 +122,6 @@ test_files:
 - test/stream_test.rb
 - test/take_test.rb
 - test/test_helper.rb
+- test/toggle_test.rb
+- test/until_test.rb
 - test/zip_test.rb
-has_rdoc: